tree 1dfbf4cd426266469ede8f741bd12d8601de06bf
parent 155a16aba065f115cae3d4f65e2a42dfcd3b6672
parent a168a83a8940eea54ee66bb7610a63ce49c67874
author Scott Main <smain@google.com> 1349237369 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349237369 -0700

am a168a83a: am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

* commit 'a168a83a8940eea54ee66bb7610a63ce49c67874':
  DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73