| commit | ba33854fbce0f1fe262c76915c36a4a7bc01f3d6 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Jan 10 23:34:41 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 10 23:34:45 2017 +0000 |
| tree | 7a729aff94d1efa99d1e252ea2e84ed7146cfcd9 | |
| parent | f41881b7fe7567fda79f25f528f05b2b630d2f0f [diff] | |
| parent | be3a8ad2ba0eedb9d200121c97f98c3638857d22 [diff] |
Merge "resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp