| commit | d0ad1052e9ecb32276b07f7042ad3bc9ebb240f5 | [log] [tgz] |
|---|---|---|
| author | Brad Ebinger <breadley@google.com> | Thu Oct 27 21:52:45 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 27 21:52:45 2016 +0000 |
| tree | 34fbb2a050cb660c62f138f2a90a154e3b79ef3e | |
| parent | 519484c8569c0b304d35787ec671b5d5fe79cb37 [diff] | |
| parent | a4faeeef90e446557a5da7d92b2be02f2c7922e5 [diff] |
resolve merge conflicts of d1b3669 to stage-aosp-master am: 5b2880ad91 am: a4faeeef90 Change-Id: Iade8f73c6aad07ef886956ba49af2fb6b5a47db5