OSDN Git Service

Merge "Resolved conflicts for merge of 28c6ec02 to master"
authorNarayan Kamath <narayan@google.com>
Thu, 16 Jan 2014 15:56:38 +0000 (15:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 16 Jan 2014 15:56:38 +0000 (15:56 +0000)

Trivial merge