commit | dcf080d571e9b40266a961ddd1a421efecdded1a | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 21:38:02 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 21:38:02 2014 +0000 |
tree | 817a622b3cf3d88327fd948058ef777791eafcf6 | |
parent | 465a99260ea1d868e9aa43d08e63cb85892f188e [diff] | |
parent | 56a794f2bf3093c9b24889e44abdcefaa976ed12 [diff] |
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