OSDN Git Service

am e2ca21cd: Merge from jb-mr1-aah-dev
authorJean-Baptiste Queru <jbq@google.com>
Fri, 28 Sep 2012 22:52:21 +0000 (15:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Sep 2012 22:52:21 +0000 (15:52 -0700)
* commit 'e2ca21cdc583071c19a4fe2dcb67f25dbdd32fe1':


Trivial merge