OSDN Git Service

Merge \"Fixed whitelistManager assignment.\" into nyc-dev
authorFelipe Leme <felipeal@google.com>
Wed, 22 Jun 2016 20:46:01 +0000 (20:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 20:46:01 +0000 (20:46 +0000)
commit1f358b11aec349627bb5afe3a5dd8f598489935e
treedc16a9c479ff6dda187368755f388495e3d56ffd
parentc14abae170b5ba123db4bbf8c191d0a690abcd05
parentdea7aa0da11bbdb0da7141d945d5aabb1d0426d6
Merge \"Fixed whitelistManager assignment.\" into nyc-dev
am: dea7aa0da1

Change-Id: I5b535a8dbbbf4f567435d666d07d909a9e79021e