| commit | db5634df8448cc1e7988ee9339bd36fc06f6be96 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Jan 12 02:23:20 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jan 12 02:23:20 2017 +0000 |
| tree | 103cc6eb1146b13c8c489e2d016678852e5dc0be | |
| parent | 4ac0495cb4301ee5de49b2a7c6962e3c61dd388c [diff] | |
| parent | 9b0df541108737496d1a6b7860ea3efd1cc95820 [diff] |
resolve merge conflicts of 20bd2d02c5 to nyc-mr1-dev-plus-aosp am: 857983c3b8 am: 9b0df54110 -s ours Change-Id: Idaab1d9fd9354ea60fcfe560fd34adb01544d70c