| commit | 7948a33f2c5a05d2f116f8b533db9f265b68f92f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Oct 14 02:55:55 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 14 02:55:55 2016 +0000 |
| tree | a0ab81834497799c7e7919dbe49ed1de85f71678 | |
| parent | 4b9774fe9724c5c86b6951e465bc259b52cc213e [diff] | |
| parent | b2ab1c43cb3cae98ac42f3eac6c2ba2d33723a8c [diff] |
resolve merge conflicts of a4398c1 to stage-aosp-master am: 195669febc am: b2ab1c43cb Change-Id: I412943235ad6cd908aca04c56aa19a3d2bbb5413