OSDN Git Service

am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick...
authorScott Main <smain@google.com>
Wed, 3 Oct 2012 04:07:42 +0000 (21:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Oct 2012 04:07:42 +0000 (21:07 -0700)
commite41404f496002a24f670f6c16f3fbae07b10ce3e
tree1dfbf4cd426266469ede8f741bd12d8601de06bf
parenta168a83a8940eea54ee66bb7610a63ce49c67874
parent83fca03d080b88d5ecda75f6c5b5a1f44fa25d8f
am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

* commit '83fca03d080b88d5ecda75f6c5b5a1f44fa25d8f':
  DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800