| commit | ddbba57228f3e380221f16fbd8edd551dff31556 | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Tue May 16 04:48:05 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 16 04:48:05 2017 +0000 |
| tree | b4a0d212a695c4cc74b0be25974b499fa1160fb9 | |
| parent | 8a180a854050758bb17a7111f61eb6bbaef08b52 [diff] | |
| parent | 611c95a3f8d5bb9053fe6309ce1a1c99b346a12f [diff] |
resolve merge conflicts of be9844a03c to oc-dev-plus-aosp am: 611c95a3f8 -s ours Change-Id: I2c6275bcdd93a511f5dff946bf2565c1e38a1b67