| commit | 60298601c5cabb1a9985733dd0cc3845cc3da581 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jan 03 21:16:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 03 21:16:45 2014 +0000 |
| tree | 6d07edaa5ea48f2f8d17389de8378ca88eef94b2 | |
| parent | 2bd34772340174e844bd4ff1f3e2096d5a7e2cf8 [diff] | |
| parent | 687ec9b5e143aa92de008efcaa7b5750eeab87ef [diff] |
am 687ec9b5: am a166bea1: am f5447b0e: Merge "Fix a sporadic build breakage." * commit '687ec9b5e143aa92de008efcaa7b5750eeab87ef': Fix a sporadic build breakage.