summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorFelipe Leme <felipeal@google.com>2016-05-27 20:04:22 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-27 20:04:22 +0000
commit8c8ea506d91db44de1d312612a8f63ab107af799 (patch)
treeac2334b0f7544bc57a38eab1742960a07d80cb28 /tools/aapt2/diff/Diff.cpp
parentc17513ef376accac19b09875291237a757819450 (diff)
parentefa291a8605e91d775faf46ada349ec7f81fcdb9 (diff)
Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev
am: efa291a860 * commit 'efa291a8605e91d775faf46ada349ec7f81fcdb9': Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent. Change-Id: Ibd09b082140b66d25bd8583040761581bb20af76
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions