| commit | 7e28a877f7d84ee546428530a5e8352018cd7f0f | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Thu May 01 00:51:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 01 00:51:06 2014 +0000 |
| tree | dd6d334011f8d6e092744e2642dd649ae99a7353 | |
| parent | e322ba1623d21f2e583a7f4e7febd6d966c67a92 [diff] | |
| parent | 2fce0c96dc6b533ea9f5aef578650b5d56787e56 [diff] |
am 2fce0c96: (-s ours) am eb9d550c: (-s ours) Merge "Fix AOSP build (DO NOT MERGE)" * commit '2fce0c96dc6b533ea9f5aef578650b5d56787e56': Fix AOSP build (DO NOT MERGE)