commit | faaf63301da2ec840a9fa750196edeb1f74c23c5 | [log] [tgz] |
---|---|---|
author | Jake Hamby <jhamby@google.com> | Wed May 08 13:33:53 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 08 13:33:53 2013 -0700 |
tree | cfbcd245380436387278aa6a0644e69e78a71601 | |
parent | 4198ae36d4cc0b5726125b3a122e645dcd7befdb [diff] | |
parent | 2e572064f74d19a91436c6ff7723c9a18230f954 [diff] |
am 2e572064: Merge "4373 & 4374 part of Severe Alerts" * commit '2e572064f74d19a91436c6ff7723c9a18230f954': 4373 & 4374 part of Severe Alerts