OSDN Git Service

am ffdd2e85: (-s ours) am 072e04a7: Merge "Bug: 22598083 Document how apps can detect...
authorBilly Lau <billylau@google.com>
Thu, 27 Aug 2015 08:23:50 +0000 (08:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 08:23:50 +0000 (08:23 +0000)
commit0e0ecf9e98d09f112b7d5ac0c81ecd8b49d4fe55
tree715d547d2502de8d04de0ec12233b3183ce62c99
parent3765a912b67b5677f964f8815864bd3f19db1ad7
parentffdd2e85e472061376e5c143b8d65a0731caeb2a
am ffdd2e85: (-s ours) am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev

* commit 'ffdd2e85e472061376e5c143b8d65a0731caeb2a':