| commit | adcd253a144bc0c8efdfec6de63adf6bfb97acbd | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@android.com> | Wed Feb 26 19:31:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 26 19:31:22 2014 +0000 |
| tree | baff88b39d8e3c8f613f02ab43fcc78391079501 | |
| parent | 300bdfa13dd903c9335c11838cc0a604d0f8f2e6 [diff] | |
| parent | 4fecd0aeeb9a76b55c234a24cfd5e1394c801348 [diff] |
am 4fecd0ae: (-s ours) am 74a8b916: am 59ff85af: (-s ours) am 2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE" * commit '4fecd0aeeb9a76b55c234a24cfd5e1394c801348': Fix AOSP build - DO NOT MERGE