commit | cf665232f332faa4d3c0c6247c6e5685684a1b2a | [log] [tgz] |
---|---|---|
author | Chris Wren <cwren@android.com> | Thu Jun 02 20:28:30 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 02 20:28:31 2016 +0000 |
tree | bf39f9a4572d36b3a2356de28ca34c87d85bc83b | |
parent | 93ef31f1ca85cea95457af3eb6b9dc0bdbb0f9fd [diff] | |
parent | c6a9857f35f89c9937370508caddb978b18b7791 [diff] |
Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev