| commit | 75ce864358f3847b07ef588a0c0983376088b46c | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri May 23 19:34:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 23 19:34:11 2014 +0000 |
| tree | 8284ae6c5324e0eb308cf7e25806de04e96065d4 | |
| parent | ecfd57c9bc5baa11c5238e8f05b80232735dd34e [diff] | |
| parent | 44a552a61e1262f9afb9b4c52fc0ac16b87e045b [diff] |
am 44a552a6: am ff5e383b: am edfcd63d: Merge "fix build" * commit '44a552a61e1262f9afb9b4c52fc0ac16b87e045b': fix build