Merge "Fixed DeviceStateMonitor unit tests" am: 09b4cd2c63 am: 3df7326f33
authorJack Yu <jackyu@google.com>
Sun, 5 Mar 2017 18:42:49 +0000 (18:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 5 Mar 2017 18:42:49 +0000 (18:42 +0000)
commite6c59457575a35468ddaa202f60ee3dd3aad9c36
tree9108d82cb64d7711ef822692c5cb1ff9308a160b
parentbbbaa0bd5130c4c49495c1b88de10bd7b64f6ed3
parent99048c3bc428685024b774602989ae9d104f0893
Merge "Fixed DeviceStateMonitor unit tests" am: 09b4cd2c63 am: 3df7326f33
am: 99048c3bc4

Change-Id: I5ffd3f58e920ec44eebf77aa1e6662e70e548d84