OSDN Git Service

am 64af43a2: am 13233e06: oopsie, missed a spot when fixing b/6970310
authorMathias Agopian <mathias@google.com>
Wed, 15 Aug 2012 23:18:21 +0000 (16:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Aug 2012 23:18:21 +0000 (16:18 -0700)
* commit '64af43a229c4c4f1bf8a1b323b2985b7469e21ec':
  oopsie, missed a spot when fixing b/6970310


Trivial merge