| commit | 5494d68d465fe9326618f3ed88127f6401e0711a | [log] [tgz] |
|---|---|---|
| author | Andrew Scull <ascull@google.com> | Fri Jan 13 15:28:36 2017 +0000 |
| committer | The Android Automerger <android-build@android.com> | Mon Jan 23 11:40:55 2017 -0800 |
| tree | d0806622a9b82c9c3bc14d7db30c8795f73351bc | |
| parent | c40c87f0cd0c4a8c5bfe6132ebe4bb13ead4052c [diff] |
resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0 (cherry picked from commit eb35ad9969a173ac4d6279a5e322e8176c2ae6d1)