| commit | be18f19f43787e60de19753d9d75f8121082eba8 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Mon Jun 16 14:36:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 16 14:36:33 2014 +0000 |
| tree | 493000df616e0055d18ab510a4c5004ea918c23a | |
| parent | aa41ba3b4388bda947f37464ae2783f3dcff4f4e [diff] | |
| parent | 7e3be689381b7d992b5cc6d97ee1c18ab88fc3b0 [diff] |
am 7e3be689: (-s ours) Merge "Fix AOSP build (DO NOT MERGE)" * commit '7e3be689381b7d992b5cc6d97ee1c18ab88fc3b0': Merge "Fix AOSP build (DO NOT MERGE)"