OSDN Git Service

Merge "Cherry pick parts of f5df700e6ce."
authorNarayan Kamath <narayan@google.com>
Thu, 27 Mar 2014 14:33:57 +0000 (14:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 27 Mar 2014 14:33:57 +0000 (14:33 +0000)

Trivial merge