Merge branch 'android-3.10-adf' into android-3.10
authorGreg Hackmann <ghackmann@google.com>
Tue, 29 Oct 2013 19:43:07 +0000 (12:43 -0700)
committerGreg Hackmann <ghackmann@google.com>
Tue, 29 Oct 2013 19:43:07 +0000 (12:43 -0700)

Trivial merge