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