| commit | 5e0ecc121c7893de01891e3e99dceb076926770e | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Fri Apr 21 01:03:31 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 21 01:03:31 2017 +0000 |
| tree | 958905a19f23c42e3909241caea05950b08d8b76 | |
| parent | be2b9e24213947a78d2b4034cc5cb319a67005c2 [diff] | |
| parent | 40d89431dbad9c7f5820ddbe21dd8a532f58f0f5 [diff] |
resolve merge conflicts of 03e80b462 to oc-dev-plus-aosp am: 40d89431db Change-Id: Iaa9b4f107451c4936025231b6eeb0d23454c1d36