| commit | fea4b4dde360cf5caa0fe887dbcc51a0a2329e25 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 21:23:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 21:23:50 2014 +0000 |
| tree | b2c0dd8cbc10eef7075cd174a78e612def3257a0 | |
| parent | 69ab594625e274ed4ca6d4a1dc7f8fb19d44f020 [diff] | |
| parent | 3450dc325670cc8e7855c93193cf6f59cf7be430 [diff] |
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 '3450dc325670cc8e7855c93193cf6f59cf7be430': resolve conflicts for merge 5a7b3b65 correctly