| commit | a9fedb0c8a60220f635f39a2cf06636babd005ca | [log] [tgz] |
|---|---|---|
| author | Jin Qian <jinqian@google.com> | Sat Nov 19 00:08:16 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Nov 19 00:08:16 2016 +0000 |
| tree | 7d3cba36c8e1644331bb8e8054d7f3f268ab9f42 | |
| parent | 2953c06b4ddffeabac70e472887b9234a937036b [diff] | |
| parent | c64f11ef648dbe4d4730704ec338ddfb8e297ca1 [diff] |
resolve merge conflicts of 456df40 to nyc-mr2-dev-plus-aosp am: c64f11ef64 Change-Id: Ie2b22a9507065231ae64af13090cb36e4957b3dd