| commit | 4d679116a760b2f9c4fb3ba7cfa61bc9ffca417f | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Tue Aug 02 09:16:34 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 02 09:16:34 2016 +0000 |
| tree | 1dcd467df23a44f96bc697f9d50d8455f9e53d22 | |
| parent | 6983564f23f9fa362493b1e269038bb99d2f8616 [diff] | |
| parent | a81ef2c54813a4b9289ef3b37674094c6dea822c [diff] |
resolve merge conflicts of 1ab38dc to nyc-dev-plus-aosp am: a81ef2c548 Change-Id: I408f747179bf22d957c6c46ad353f0234010d362