| commit | 349e915dafbcebafcf204bda12739f9287ae51ce | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Feb 14 00:58:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 00:58:46 2014 +0000 |
| tree | 449c500273db0cbdef9f71e6c66cca5c85699ab4 | |
| parent | b01233f26f8d4a028ac1def2330005c3dade070a [diff] | |
| parent | cb241895046e9827801811d8455be120ff2ea9f2 [diff] |
am cb241895: am a9baf879: Merge "fix build" * commit 'cb241895046e9827801811d8455be120ff2ea9f2': fix build