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