OSDN Git Service

am 6408e7e7: (-s ours) am 554dc0f7: am eaffe350: Merge "Fix race condition for method...
authorMathieu Chartier <mathieuc@google.com>
Thu, 27 Aug 2015 03:50:43 +0000 (03:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 03:50:43 +0000 (03:50 +0000)
* commit '6408e7e750acb6fbc3d83821a73621669b46791c':


Trivial merge