OSDN Git Service

am 15e23378: am e6325869: (-s ours) am 1d4247c4: Merge "Improve tracking of screen...
authorDianne Hackborn <hackbod@google.com>
Thu, 27 Aug 2015 17:16:10 +0000 (17:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 17:16:10 +0000 (17:16 +0000)
commit40bd315dcc62014c22235962bfba8307109348c2
tree4e9052ca12f00de06c77cb3ce93ab1eb160e691b
parentcdea1102c56ba8ce0d5ff0b77e1c30f4e6bca2c2
parent15e233785af8125dea78e540fb74d55c8c46daee
am 15e23378: am e6325869: (-s ours) am 1d4247c4: Merge "Improve tracking of screen on reasons." into mnc-dev

* commit '15e233785af8125dea78e540fb74d55c8c46daee':