| commit | 1cef1541a8df8cbdb5af4f7d12c091001f785950 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Jan 10 23:50:28 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 10 23:50:28 2017 +0000 |
| tree | 5c5a22e7e943bb3eb97af749c69264146f24156b | |
| parent | 460e9104d09cd15543ba28eb95b3869018b81733 [diff] | |
| parent | fb52b3700cf1d4e5b28206134ea651301c67bda3 [diff] |
resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp am: be3a8ad2ba am: fb52b3700c Change-Id: I7df690c4511898936c5a2b397034c108c29ebef2