commit | de5cd2f5bdb4ca7d59a1adb5ec9c98fb02de2af4 | [log] [tgz] |
---|---|---|
author | Sameer Padala <sxp@google.com> | Fri May 16 19:17:03 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 16 19:17:03 2014 +0000 |
tree | a97c7b20718808adf0e8a88198e7d62ad40f4b33 | |
parent | 82b1dedac93c2bf6d189861e2b69dde6f35c5c68 [diff] | |
parent | e6203a4d300ac0bcc4ef6cbeba7b4560d71331b7 [diff] |
am e6203a4d: Merge "Fix build" into ub-now-nova * commit 'e6203a4d300ac0bcc4ef6cbeba7b4560d71331b7': Fix build