summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorMark Renouf <mrenouf@google.com>2015-03-11 20:09:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-11 20:09:08 +0000
commit41cd70e3647c3ce3faeb285b219d0c0637d97bf6 (patch)
treeb35e7e39a1f720797a473944ff8d819b66d0f5c4 /native
parent57baee2e12d1102372153cb4a66ff151c5cc855c (diff)
parent91239a0b738a503ab0f4ed4111e1b5f81d927e38 (diff)
downloadframeworks_base-41cd70e3647c3ce3faeb285b219d0c0637d97bf6.zip
frameworks_base-41cd70e3647c3ce3faeb285b219d0c0637d97bf6.tar.gz
frameworks_base-41cd70e3647c3ce3faeb285b219d0c0637d97bf6.tar.bz2
am 91239a0b: am cc2212d2: Merge "Adds system property for developer option for force-enable burn-in protection" into lmp-mr1-modular-dev
* commit '91239a0b738a503ab0f4ed4111e1b5f81d927e38': Adds system property for developer option for force-enable burn-in protection
Diffstat (limited to 'native')
0 files changed, 0 insertions, 0 deletions