OSDN Git Service

am 56a794f2: am 96e30774: am fea4b4dd: am 3450dc32: am 06018d92: am f41a380b: am...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 21:38:02 +0000 (21:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 21:38:02 +0000 (21:38 +0000)
commitdcf080d571e9b40266a961ddd1a421efecdded1a
tree817a622b3cf3d88327fd948058ef777791eafcf6
parent465a99260ea1d868e9aa43d08e63cb85892f188e
parent56a794f2bf3093c9b24889e44abdcefaa976ed12
am 56a794f2: am 96e30774: am fea4b4dd: am 3450dc32: am 06018d92: am f41a380b: am d10ca17d: am 8921409a: am 10fb4fe4: am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp

* commit '56a794f2bf3093c9b24889e44abdcefaa976ed12':
  resolve conflicts for merge 5a7b3b65 correctly