tree deeec2c7e0b300a5a4e5aa1f60ec7c2ce0b5fe34
parent 69b77b37c0c05448114c0ae479bb6b2efd36f0f1
parent fee56f1dd004aa99e01393726cf2bf498143fc22
author Sander Alewijnse <salewijnse@google.com> 1429023143 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429023143 +0000

am fee56f1d: am c912a86c: am 00a871ca: am 4e2689b5: am d4fefc51: am 44e09b47: Merge "Add cts test for testing launcher version." into lmp-sprout-dev

* commit 'fee56f1dd004aa99e01393726cf2bf498143fc22':
  Add cts test for testing launcher version.