| commit | 70efbad0648eb96e9becbd0529cc1f34b6ffb986 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 17:58:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 17:58:17 2014 +0000 |
| tree | 7a4dc4d09bd4860ced1707981a6fa8512841e268 | |
| parent | 8bf73eae6c98532c8a597b885b948b9878555441 [diff] | |
| parent | bd5a3e6510e83b161a0e40c191d349524ae4a8e6 [diff] |
am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp * commit 'bd5a3e6510e83b161a0e40c191d349524ae4a8e6': resolve conflicts for merge 5a7b3b65 correctly