OSDN Git Service

am 9163a4a6: am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.
authorXavier Ducrohet <xav@android.com>
Wed, 13 Jul 2011 21:53:54 +0000 (14:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 Jul 2011 21:53:54 +0000 (14:53 -0700)
* commit '9163a4a686fc25fefc77d5b41c24a4538486a48e':
  Merge 36a3a392 from mr1.


Trivial merge