| commit | 2e1616a99d271deca4e18d0406d6d3652106dfda | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Wed Jun 04 15:19:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 15:19:36 2014 +0000 |
| tree | 6c79f96d76e0608f48a0c95392cc9ae48b442176 | |
| parent | 9531848772f8428d89d72cfbb145e61a2ec6a74d [diff] | |
| parent | 1e3d0c89282627f8b0d66d2bdae4efc2287ab043 [diff] |
am 1e3d0c89: (-s ours) Fix AOSP build (DO NOT MERGE) * commit '1e3d0c89282627f8b0d66d2bdae4efc2287ab043': Fix AOSP build (DO NOT MERGE)