| commit | 3017a0157353cd0b34ef67ac15e8086f9f651d12 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Mar 20 16:33:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 16:33:29 2014 +0000 |
| tree | 9a60abd0237fe903f37bd3c01872dc711c14fe29 | |
| parent | 09cb89414062b5b6b8830307797c83166e1b07d6 [diff] | |
| parent | e397d90fbdc51c269b82e08dd363bb14d90230dc [diff] |
am e397d90f: am e0683de5: am 37050124: am a413a4ae: Fix the build. DO NOT MERGE * commit 'e397d90fbdc51c269b82e08dd363bb14d90230dc': Fix the build. DO NOT MERGE