commit | 551f8ff5d961b27c90bc376619ad84fa16bfacda | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Mon Dec 16 06:00:21 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 16 06:00:21 2013 +0000 |
tree | 1df01daa2250551c10f054108aa315de1b6a7ca9 | |
parent | a22f6093ddfd99e1636aa280706992270794731a [diff] | |
parent | df040dc1002b3e41af44a82cdea5e842027b0873 [diff] |
am df040dc1: am 53c8f8b8: am 875922bb: Merge "fix build." * commit 'df040dc1002b3e41af44a82cdea5e842027b0873': fix build.