OSDN Git Service

Merge "Adds the headers for choose lock generic inside onCreate" into nyc-dev
authorUdam Saini <udam@google.com>
Tue, 9 Feb 2016 18:47:13 +0000 (18:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 9 Feb 2016 18:47:13 +0000 (18:47 +0000)

Trivial merge