| commit | 74a8b916aceb0b55a7fdfa63bd8267c50d952a28 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@android.com> | Wed Feb 26 19:10:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 26 19:10:44 2014 +0000 |
| tree | ca447ed35138f9dcfc10cbb4e2a47e2057175225 | |
| parent | aecb8c43d0c6c3d2b55f88abeaa0e3197be59301 [diff] | |
| parent | 59ff85af314e2984068943f5572ac40ef381edea [diff] |
am 59ff85af: (-s ours) am 2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE" * commit '59ff85af314e2984068943f5572ac40ef381edea': Fix AOSP build - DO NOT MERGE