| commit | 845e5c77b551b7b3079f9e6adf1f780f96729c33 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Wed May 21 18:53:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 21 18:53:15 2014 +0000 |
| tree | 1856f7408ea3f10218250afe8221a329367a8ea0 | |
| parent | bce2357e42fdfb45556ec57ccb54d587e645f196 [diff] | |
| parent | fc11ebc50141c5fcd2d2a9ff36595d72962e7d07 [diff] |
am fc11ebc5: am 3d5a4240: Merge "Fix build." * commit 'fc11ebc50141c5fcd2d2a9ff36595d72962e7d07': Fix build.