tree 9c67d72b5e8122e1a521b9f9b993692ad1fa73a6
parent 43d958682f71fa466a3ec2ca8da3b1eccb98e32a
parent 6bd17c9a622bf6e2486b39dd79aa6bd90a0d74f3
author Unsuk Jung <unsuk@google.com> 1443728310 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443728310 +0000

am 6bd17c9a: DO NOT MERGE CTS version is now 6.0_r1

* commit '6bd17c9a622bf6e2486b39dd79aa6bd90a0d74f3':
  DO NOT MERGE CTS version is now 6.0_r1