OSDN Git Service

am af864260: am 7507d03f: am e07f513b: am 04a68914: am 25f47659: am 05192e5a: Merge...
authorClay Murphy <claym@google.com>
Mon, 12 May 2014 23:28:26 +0000 (23:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:28:26 +0000 (23:28 +0000)
* commit 'af8642606a93b115cb87d346968c9a26de288b56':


Trivial merge