| commit | fb52b3700cf1d4e5b28206134ea651301c67bda3 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Jan 10 23:42:12 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 10 23:42:12 2017 +0000 |
| tree | d68d14c78f4d1896a5d2fd5b62cfe19ad4dc888d | |
| parent | 24d5a0bae29c7696624038ffc76bc3b3294e10c0 [diff] | |
| parent | be3a8ad2ba0eedb9d200121c97f98c3638857d22 [diff] |
resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp am: be3a8ad2ba Change-Id: I76970ff769a4cad2b3d702f0282515fb58defcbb