| commit | 2131dcf9f6c41c74fd33ea97bf30bb56ed997d2b | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Sep 28 12:42:59 2016 -0700 |
| committer | Tao Bao <tbao@google.com> | Wed Sep 28 12:42:59 2016 -0700 |
| tree | 12244e0b4f804c93b80d174524c154fb60d436b6 | |
| parent | 882737b7cb6d541df0b0b9e2b7ef14da1dd95915 [diff] | |
| parent | 199c0b39484e24c5a9a65802adb208c2f3863dce [diff] |
resolve merge conflicts of 199c0b3 to nyc-mr1-dev-plus-aosp Change-Id: Icde635bb8efd981f9d14bd2d2d471693ebc0958b