tree ed9920c4b3a36526ead889524cb2984eea9c75f8
parent c77e5aa3d2286690e76933dbf46653880f637f53
parent 0e8212053b47f73f561d293922a24913354fcfaa
author Daniel Xie <dxie@google.com> 1445988043 +0000
committer android-build-merger <android-build-merger@google.com> 1445988043 +0000

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

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