| commit | 7126c3c7aebad0e92a9779c534c8e42bd66b4cbd | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed May 14 00:41:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 00:41:04 2014 +0000 |
| tree | de1721b5ea24c777433b74c1670b578f30cd374b | |
| parent | 14edfa8f658066a1d59a890a19218167ad6121a4 [diff] | |
| parent | 406e38bd20b0cc0dc60c0a9d132566490c0672af [diff] |
am 406e38bd: am 80816bfc: am f73dbcc3: am 9916c17e: am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev * commit '406e38bd20b0cc0dc60c0a9d132566490c0672af': Fix build due to incorrect merges [DO NOT MERGE]