diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2016-01-15 00:49:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-15 00:49:44 +0000 |
| commit | eab078d0b1abebf6f005fd95df72eca107c3e80c (patch) | |
| tree | 3edcea13261beb3b42a2b4e4d55ab14e3ace186e | |
| parent | 795243686fe2e1c352732b47bcdb6ea9e9e7e39e (diff) | |
| parent | 2da2f1b383a00cb9919807867a9583fe09f1a449 (diff) | |
| download | frameworks_av-eab078d0b1abebf6f005fd95df72eca107c3e80c.zip frameworks_av-eab078d0b1abebf6f005fd95df72eca107c3e80c.tar.gz frameworks_av-eab078d0b1abebf6f005fd95df72eca107c3e80c.tar.bz2 | |
resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff am: 295a488e49 am: 1ab7985b88 am: 6313e262f9 -s ours
am: 2da2f1b383
* commit '2da2f1b383a00cb9919807867a9583fe09f1a449':
Camera: Disallow dumping clients directly
0 files changed, 0 insertions, 0 deletions