| commit | 22eb71b11dfc2e4172e68ff687679397ebec1d43 | [log] [tgz] |
|---|---|---|
| author | Marie Janssen <jamuraa@google.com> | Mon Oct 31 19:00:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 31 19:00:50 2016 +0000 |
| tree | 66b576493d39f37c32ad3c83aaa30e5951bd4e3f | |
| parent | 0daded40468fb4d1d0bc4755a3c77058a8ef25e5 [diff] | |
| parent | 03836e31a94e942987d182588a861c40129e2dda [diff] |
resolve merge conflicts of 6a31a5c to stage-aosp-master am: 879a5169ec am: 635d528877 am: 03836e31a9 Change-Id: Iefdedf47a91d398ca3c45656a4d73749acd03e6d