| commit | a74ceabe6c3d0fefc8b08d954c802b43d8c9d4fc | [log] [tgz] |
|---|---|---|
| author | Zhengyin Qian <qianzy@google.com> | Wed Aug 17 20:49:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 17 20:49:56 2016 +0000 |
| tree | e7082e9c261e004c590cf448843d90723b013093 | |
| parent | 655c3ea7fc15bba5b56811a36083e2dcee2db550 [diff] | |
| parent | d0f89bf3df3ccbe1c8750e0ad1124c1bd2b61276 [diff] |
resolve merge conflicts of 068ecc7 to nyc-mr1-dev-plus-aosp am: d0f89bf3df Change-Id: I1c4eb54bb66ed940f6fba2a8a67e55e5c7a83acb