Merge "Import changes from an internal repo." into lmp-dev
authorJarkko Pöyry <jpoyry@google.com>
Tue, 30 Sep 2014 23:36:28 +0000 (23:36 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 30 Sep 2014 23:36:28 +0000 (23:36 +0000)

Trivial merge