commit | 00fb74c100fb99431edad714b7270af80141f44d | [log] [tgz] |
---|---|---|
author | Wei Liu <luciferleo@google.com> | Fri Jun 19 16:25:29 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 19 16:25:29 2015 +0000 |
tree | 303624674ba313206388337bf7bf96ecb4b964af | |
parent | 4c25a00e83413ebc6b69fa28abf9f8d83a68f68a [diff] | |
parent | f4cc262847fb17f3aecd85c0b7d09e05ed937b8c [diff] |
am f4cc2628: am 01e5cf9d: am 940335ba: Merge "resolved conflicts for merge of 1dac6bd9 to mnc-dev" into mnc-dev * commit 'f4cc262847fb17f3aecd85c0b7d09e05ed937b8c': Wear doesn't need Shell to send notification when bugreport captured.