| commit | d2e7c2e0a1fb7323d5b378a50a934270739f4eea | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Jan 10 23:51:35 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 10 23:51:35 2017 +0000 |
| tree | 5c5a22e7e943bb3eb97af749c69264146f24156b | |
| parent | 1cef1541a8df8cbdb5af4f7d12c091001f785950 [diff] | |
| parent | 75bcb014661f9e8b57f684403c9f424bab05a0e8 [diff] |
Merge "resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am: ba33854fbc am: 75bcb01466 Change-Id: I62a5c933c49bc7d3c1ee996b09b0255b1fc25d19