| commit | 2359ddb039fe38ada7aaee26f41d465574fede34 | [log] [tgz] |
|---|---|---|
| author | Naveen Kalla <mrnaveen@google.com> | Fri Jul 14 04:03:10 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 14 04:03:10 2017 +0000 |
| tree | e554759d7a97ca39bea75c5706cc3807b84d2926 | |
| parent | 6fee87a865828bb8d9d5c7c117fcf725fd5736a4 [diff] | |
| parent | 7e15c580852a1f18614396bc0f85f8e04d737d19 [diff] |
resolve merge conflicts of b78661052c44 to oc-dr1-dev-plus-aosp am: 7e15c58085 -s ours Change-Id: I8beaabea919d72b47137234926b1d82507798109