resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e (295a488e) · Commits · e / os / android_frameworks_av · GitLab

Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 295a488e authored Jan 15, 2016 by Eino-Ville Talvala Committed by android-build-merger Jan 15, 2016

resolve merge conflicts of 88b736a1 to lmp-dev. am: 89982396

am: 0fefc974

* commit '0fefc974':
  Camera: Disallow dumping clients directly

parents e2e46f5f 0fefc974

Hide whitespace changes

Inline Side-by-side

Rohit Sekhar @merothh
mentioned in commit 2da2f1b3
· Sep 13, 2022

mentioned in commit 2da2f1b3

mentioned in commit 2da2f1b383a00cb9919807867a9583fe09f1a449

Toggle commit list
Rohit Sekhar @merothh
mentioned in commit 1ab7985b
· Sep 13, 2022

mentioned in commit 1ab7985b

mentioned in commit 1ab7985b88febde58352c7410c26dcca35b7043a

Toggle commit list
Rohit Sekhar @merothh
mentioned in commit 240c2126
· Sep 13, 2022

mentioned in commit 240c2126

mentioned in commit 240c2126e491eb3f3d3ffce35bc1fd33e9e350b4

Toggle commit list
Rohit Sekhar @merothh
mentioned in commit 6313e262
· Sep 13, 2022

mentioned in commit 6313e262

mentioned in commit 6313e262f90683d46e4bdbe7b59df47c432b5772

Toggle commit list
Rohit Sekhar @merothh
mentioned in commit 9dacf272
· Sep 13, 2022

mentioned in commit 9dacf272

mentioned in commit 9dacf2727c5919faea7cc103eeedfceceeff83b6

Toggle commit list
Rohit Sekhar @merothh
mentioned in commit eab078d0
· Sep 13, 2022

mentioned in commit eab078d0

mentioned in commit eab078d0b1abebf6f005fd95df72eca107c3e80c

Toggle commit list

Please register or to comment