| commit | 59ff85af314e2984068943f5572ac40ef381edea | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@android.com> | Wed Feb 26 11:06:30 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 26 11:06:30 2014 -0800 |
| tree | 7438ebca334a50efe31724f7b60ec3b54d9346cf | |
| parent | 7b4cce68853d8bcfce2b6bd7f999915063eb56d2 [diff] | |
| parent | 2729857df6c559b37248c96b78303b662212d14b [diff] |
am 2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE" * commit '2729857df6c559b37248c96b78303b662212d14b': Fix AOSP build - DO NOT MERGE