OSDN Git Service

am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb...
authorScott Main <smain@google.com>
Wed, 3 Oct 2012 04:03:18 +0000 (21:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Oct 2012 04:03:18 +0000 (21:03 -0700)
commit142158bd218421741d6d133e9ebbb1203ae6e6a6
tree3c87cfc3f069a65925e0b7b33bb3257b39d30a50
parentf5878b3ea31a04d13888f14bd652340da8a38437
parent6eb95f1ac83a02a7bdb68cdcc5a09e7079ff46c0
am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

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