OSDN Git Service

am a168a83a: am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE...
authorScott Main <smain@google.com>
Wed, 3 Oct 2012 04:09:29 +0000 (21:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Oct 2012 04:09:29 +0000 (21:09 -0700)
* commit 'a168a83a8940eea54ee66bb7610a63ce49c67874':
  DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73


Trivial merge