tree 66c0ed78f6719516468fa3d9e16f74d2b0601228
parent 16df192a2b2ee07f92120456b6f95caf6e1f9ad4
parent 81f03898e59400bb77eb6525956b06e6762b550e
author Deepanshu Gupta <deepanshu@google.com> 1412242701 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412242701 +0000

am 81f03898: am ba526a28: am d00d2ff2: (-s ours) am 57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev

* commit '81f03898e59400bb77eb6525956b06e6762b550e':
  Fix Tests after cherry picks. [DO NOT MERGE]