| commit | 5e89b120e16c65946e8280d485f4f5e3c895782e | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Fri Nov 04 02:34:49 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 04 02:34:49 2016 +0000 |
| tree | 61cbf38c56e0eb32bffb0d84bcf98616a3583a2b | |
| parent | b5a1eb4f3e52bb6b8bd9665143a0642138346cc3 [diff] | |
| parent | 46f7245a85f9de8fcd9b3d952c250ca0ffb62661 [diff] |
Revert "resolve merge conflicts of ec59898 to nyc-mr2-dev-plus-aosp" am: 46f7245a85 Change-Id: Ibbf803820796dd1d8bf2f0f6910cc0a2d43a7592