OSDN Git Service

am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev
authorJim Miller <jaggies@google.com>
Wed, 15 Jul 2015 21:59:27 +0000 (21:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 21:59:27 +0000 (21:59 +0000)
commit204c2de8bb2a804991b8bbd5be9877ac1a52e150
tree86929e2a670f2a34f78fc66721cf1f476f5883af
parent26fa501dd6bf906344dd6ba3ff4d110b735a3547
parentc7b0435cc709c328da8e2b515ea04c8bc40d1094
am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev

* commit 'c7b0435cc709c328da8e2b515ea04c8bc40d1094':
  Improve tracking of screen on reasons.