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