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