| commit | d1cccf464a0bc6a7ac615b5fb8d671c78ceb7243 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Mon Aug 01 22:29:40 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 01 22:29:40 2016 +0000 |
| tree | 7f3d13127657a8038a95701d25575460d7fe3af6 | |
| parent | bdad35934920d2874433a1900b673d1c70d88c0a [diff] | |
| parent | b143c9708cfe9b17d17e3864c93d6a9c5e5a0569 [diff] |
resolve merge conflicts of d072ed3 to nyc-mr1-dev-plus-aosp am: b143c9708c Change-Id: I5e04a185d827e29c994a9510f7ffc6adfc832247