| commit | 96e30774c019e1f4400ac2d7a724ea7328bec1ac | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 21:28:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 21:28:32 2014 +0000 |
| tree | 82d61b4a2688ffeea6c81c6622e7600930af75eb | |
| parent | 569dc64cd6b0bb7bdfec97967b192d2a706e3f81 [diff] | |
| parent | fea4b4dde360cf5caa0fe887dbcc51a0a2329e25 [diff] |
am fea4b4dd: 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 'fea4b4dde360cf5caa0fe887dbcc51a0a2329e25': resolve conflicts for merge 5a7b3b65 correctly