| tag | 22315eba19994e711741bd97beb111c4cbedb5ec | |
|---|---|---|
| tagger | The Android Open Source Project <initial-contribution@android.com> | Wed Mar 09 13:35:54 2016 -0800 |
| object | 9dacf2727c5919faea7cc103eeedfceceeff83b6 |
Android 6.0.1 release 21
| commit | 9dacf2727c5919faea7cc103eeedfceceeff83b6 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Jan 15 00:59:31 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 15 00:59:31 2016 +0000 |
| tree | e757172164fb43a787e0a3a863d18172637b865c | |
| parent | 3a0d1df37df09b0fbbc7b9768c6f7d530fd7a024 [diff] | |
| parent | 240c2126e491eb3f3d3ffce35bc1fd33e9e350b4 [diff] |
resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff am: 295a488e49 am: 1ab7985b88 am: 6313e262f9 -s ours am: 2da2f1b383 am: eab078d0b1 am: 240c2126e4 * commit '240c2126e491eb3f3d3ffce35bc1fd33e9e350b4': Camera: Disallow dumping clients directly