OSDN Git Service

am 880d88b3: Merge "Restore changes that were needed." into lmp-dev
authorCraig Mautner <cmautner@google.com>
Tue, 16 Sep 2014 23:00:20 +0000 (23:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 23:00:20 +0000 (23:00 +0000)
commitf9f5f56488cbd8742c3b1bbf6c36689eacdf01d6
tree868b70fbd12194adb7aee427bf524bf2ab852ed2
parentf1482579ed0b94afcc97a894d93816212c0240d5
parentfb1bf84165375a29e5947e3f6f6345c57de1a7d1
am 880d88b3: Merge "Restore changes that were needed." into lmp-dev

* commit '880d88b308c73a598578f39892a3f01c201d9314':
  Restore changes that were needed.