commit | b04e4f399fb87b3fabeadd3f576dfd950e50333d | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Mon Jan 18 22:23:29 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jan 18 22:23:29 2016 +0000 |
tree | 7d889519c086aa2258141be5ed8e1320eae2d6a9 | |
parent | 8908bafdfd018588310134289aac501dfb7fb6ba [diff] | |
parent | acadecc918d24e26ef0bd5857cd59b9123991968 [diff] |
Merge "DO NOT MEGE ANYWHERE: BUMP CTS 5.1 to R5" into lollipop-mr1-cts-dev am: c0c1c9e832 -s ours am: d3c154f17e am: 85c1a9b36e am: 5548a062b5 am: acadecc918 * commit 'acadecc918d24e26ef0bd5857cd59b9123991968': DO NOT MEGE ANYWHERE: BUMP CTS 5.1 to R5