tree 26c708942000c35a78d4558c941b1822a5eb8b26
parent 41093f860c88767dde469af87f141999c4b660f5
parent ba72ac87a7edc4462c5d40a349f4ef9dc7d1d68a
author Daniel Xie <dxie@google.com> 1445989220 +0000
committer android-build-merger <android-build-merger@google.com> 1445989220 +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
am: ba72ac87a7  -s ours

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