summaryrefslogtreecommitdiffstats
path: root/packages/Shell/Android.mk
diff options
context:
space:
mode:
authorWei Liu <luciferleo@google.com>2015-06-19 06:02:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-19 06:02:54 +0000
commit01e5cf9ddffa2d2b11d2c8ece58ab4f734a597d9 (patch)
treeb2f2459d670e468a6d8755486e3bcfc006e83f70 /packages/Shell/Android.mk
parent687b32591b29442a5c2d181e7acd72a94ce93eab (diff)
parent940335ba5b68f3382d7b42ba4fd781c8120bc370 (diff)
downloadframeworks_base-01e5cf9ddffa2d2b11d2c8ece58ab4f734a597d9.zip
frameworks_base-01e5cf9ddffa2d2b11d2c8ece58ab4f734a597d9.tar.gz
frameworks_base-01e5cf9ddffa2d2b11d2c8ece58ab4f734a597d9.tar.bz2
am 940335ba: Merge "resolved conflicts for merge of 1dac6bd9 to mnc-dev" into mnc-dev
* commit '940335ba5b68f3382d7b42ba4fd781c8120bc370': Wear doesn't need Shell to send notification when bugreport captured.
Diffstat (limited to 'packages/Shell/Android.mk')
0 files changed, 0 insertions, 0 deletions