OSDN Git Service

am 331a03d2: (-s ours) am 49a723a5: am afb83c6b: (-s ours) am 62cf72b0: am 60d43dde...
authorsmain@google.com <smain@google.com>
Mon, 14 Jul 2014 20:50:50 +0000 (20:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Jul 2014 20:50:50 +0000 (20:50 +0000)
* commit '331a03d2a284cdfce190c9503716a56dba417708':


Trivial merge