OSDN Git Service

am 15a1fa6c: (-s ours) am 6848874d: am 399426d9: Merge "Added next condition check...
authorRoland Levillain <rpl@google.com>
Thu, 27 Aug 2015 03:46:08 +0000 (03:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 03:46:08 +0000 (03:46 +0000)
* commit '15a1fa6cebf96db2290d473400ecb2d794ad44bc':


Trivial merge