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)
* commit '83fca03d080b88d5ecda75f6c5b5a1f44fa25d8f':
  DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800


Trivial merge