OSDN Git Service

Merge "Handle cases for going to SHADE_LOCKED" into lmp-dev
authorJorim Jaggi <jjaggi@google.com>
Mon, 28 Jul 2014 13:52:17 +0000 (13:52 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 24 Jul 2014 15:35:58 +0000 (15:35 +0000)

Trivial merge