| commit | 398e6353cc22c821e5c8cbba013953517ac30c93 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jan 03 21:19:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 03 21:19:15 2014 +0000 |
| tree | 1e352b16c6a79d23d65a9eecc7bed701e02f8b4e | |
| parent | 0d123f21e1a92aefd2f0f3260d2d5f1b46f83bf8 [diff] | |
| parent | 60298601c5cabb1a9985733dd0cc3845cc3da581 [diff] |
am 60298601: am 687ec9b5: am a166bea1: am f5447b0e: Merge "Fix a sporadic build breakage." * commit '60298601c5cabb1a9985733dd0cc3845cc3da581': Fix a sporadic build breakage.