| commit | 09fe0ea27019e133391e6d3547a183d66c1c0054 | [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 | e0bafb4dc2162c751f24f5bfbd40d94f9b780609 [diff] | |
| parent | 30b93e1b6c3744197989dce3cb4ae243ef6ca3e8 [diff] |
resolve merge conflicts of d072ed3 to nyc-mr1-dev-plus-aosp am: b143c9708c Change-Id: I5e04a185d827e29c994a9510f7ffc6adfc832247