| tag | 5c0177f7b476fcd3e23b56b11944a8398fe02c27 | |
|---|---|---|
| tagger | The Android Open Source Project <initial-contribution@android.com> | Thu Mar 10 17:16:01 2016 -0800 |
| object | 6ad0c98cb9ae119156b264a7532b1e0cc701e0d8 |
Android 5.1.1 release 36
| commit | 6ad0c98cb9ae119156b264a7532b1e0cc701e0d8 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Wed Jan 13 10:07:04 2016 -0800 |
| committer | The Android Automerger <android-build@android.com> | Fri Jan 22 14:46:07 2016 -0800 |
| tree | cc1e9e36057f151445ca934d69452701f9415cc2 | |
| parent | 5a6788730acfc6fd8f4a6ef89d2c376572a26b55 [diff] |
Merge Conflict Addressed. Camera: Disallow dumping clients directly Camera service dumps should only be initiated through ICameraService::dump. Bug: 26265403 Change-Id: If3ca4718ed74bf33ad8a416192689203029e2803