OSDN Git Service

am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly"...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 17:58:17 +0000 (17:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 17:58:17 +0000 (17:58 +0000)
commit70efbad0648eb96e9becbd0529cc1f34b6ffb986
tree7a4dc4d09bd4860ced1707981a6fa8512841e268
parent8bf73eae6c98532c8a597b885b948b9878555441
parentbd5a3e6510e83b161a0e40c191d349524ae4a8e6
am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp

* commit 'bd5a3e6510e83b161a0e40c191d349524ae4a8e6':
  resolve conflicts for merge 5a7b3b65 correctly