OSDN Git Service

Merge "Fix issues #16941902, #16901402, and #16135174." into lmp-dev
authorDianne Hackborn <hackbod@google.com>
Wed, 27 Aug 2014 23:35:04 +0000 (23:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 27 Aug 2014 23:35:04 +0000 (23:35 +0000)

Trivial merge