| commit | c362b894a87876c37131b9a7beadf9649d25ff5b | [log] [tgz] |
|---|---|---|
| author | Naveen Kalla <mrnaveen@google.com> | Fri Oct 28 23:16:34 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 28 23:16:34 2016 +0000 |
| tree | 4bab403a86e7a6970e8c55a325157d79a8d07b74 | |
| parent | 633f08bc7bc61bf478a1c4077388598be2d673da [diff] | |
| parent | 27de3fc0a14e4adc73f6bb5e68f90a59d0e68110 [diff] |
resolve merge conflicts of de591df to nyc-mr2-dev-plus-aosp am: 27de3fc0a1 -s ours Change-Id: I6184d22117a81ba5a7b0a8b18108eb9f178d08f9