tree 7bad83faf14171f27f122622282f7fc6b6fcaebd
parent 83f87f183c469ed5a8bdfe0922d94d4d8a199746
parent c1f6baf9ec1f8dbe48a568f50414c349a25d9763
author Daniel Xie <dxie@google.com> 1445988917 +0000
committer android-build-merger <android-build-merger@google.com> 1445988917 +0000

Merge "DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4" into lollipop-mr1-cts-dev am: 0e8212053b  -s ours am: 2a72b1b08e  -s ours
am: c1f6baf9ec  -s ours

* commit 'c1f6baf9ec1f8dbe48a568f50414c349a25d9763':
  DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4