| commit | 35ea9f855639f74cc3a5aca38927977fc6a7c97e | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Fri Aug 05 22:57:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 05 22:57:47 2016 +0000 |
| tree | 5ff6a1b0d2106d520764f3fed25aec826d464522 | |
| parent | fb4a57b5c4c0195358364d955050218936599c7b [diff] | |
| parent | 2a001e8bfe0255242740df7d9674408820f13627 [diff] |
resolve merge conflicts of 0783d5f to stage-aosp-master am: 2a001e8bfe Change-Id: Ib0fc16f4a35761c0b2a3e3273800e1f27e527577