| commit | 6313e262f90683d46e4bdbe7b59df47c432b5772 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Jan 15 00:26:12 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 15 00:26:12 2016 +0000 |
| tree | 26faf554c76eb8b293c7948dae0d8bdefb351215 | |
| parent | 0945199000aaa5a628705de69f17d28a5c04cc36 [diff] | |
| parent | 1ab7985b88febde58352c7410c26dcca35b7043a [diff] |
resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff am: 295a488e49 am: 1ab7985b88 * commit '1ab7985b88febde58352c7410c26dcca35b7043a': Camera: Disallow dumping clients directly