| commit | 918add26fe677d7c6d1f866376d3f6bb5e9be1d3 | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Tue May 24 01:19:37 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 24 01:19:37 2016 +0000 |
| tree | 65237ca8c8583486b6bb5582eeba71e1509294c8 | |
| parent | be04a5efa269c2746ad7d7df5bb81350f2f6096f [diff] | |
| parent | f51e507fa714c7e00c70539d9c57723fc2ea060a [diff] |
resolve merge conflicts of 50f6417 am: 3f6eb86390 am: f51e507fa7 * commit 'f51e507fa714c7e00c70539d9c57723fc2ea060a': resolve merge conflicts of 50f6417 Change-Id: I2f44ff16dd4471d7944371f94508637171b80a6e