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:50:39 +0000 (18:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Feb 2016 18:50:39 +0000 (18:50 +0000)
commitd36f4e2be29f59041f078313b8e42547e3ffeeae
tree2c38bf415a4f5566ec0110037345ebe704bbc25d
parent711b01b80dabf096b814b7bbcb1686c462bb3adb
parent40f4bf2a1fc9e4c60f44661647f091f6c0e91cb3
Merge "Adds the headers for choose lock generic inside onCreate" into nyc-dev
am: 40f4bf2a1f

* commit '40f4bf2a1fc9e4c60f44661647f091f6c0e91cb3':
  Adds the headers for choose lock generic inside onCreate