commit | c1f6baf9ec1f8dbe48a568f50414c349a25d9763 | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Oct 27 23:27:56 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 27 23:27:56 2015 +0000 |
tree | 3294117dd471210f5d5a49bc06be180578738863 | |
parent | a0025366126e6807bc1a0b6a0b9d37df8877593a [diff] | |
parent | 2a72b1b08e8e224a7190b67acf91512b89369ef7 [diff] |
Merge "DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4" into lollipop-mr1-cts-dev am: 0e8212053b -s ours am: 2a72b1b08e -s ours * commit '2a72b1b08e8e224a7190b67acf91512b89369ef7': DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4