OSDN Git Service

am 9fc96fac: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:44:27 +0000 (05:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 May 2013 12:44:27 +0000 (05:44 -0700)
commit62a91ef437e5e705fd101df2d8616e62990cc02b
tree306563fb635ae22dfe6e36518b59bb5cb781c46a
parentbd2aaf3325eafea85e692d5fb76815bbc4991f85
parent9fc96facfd38ae616ae02ad4c54e5114cc088540
am 9fc96fac: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '9fc96facfd38ae616ae02ad4c54e5114cc088540':