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