commit | b742c981b54cbd93c8355095963bd82f5a12d79d | [log] [tgz] |
---|---|---|
author | Yorke Lee <yorkelee@google.com> | Tue Mar 18 17:28:46 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 17:28:46 2014 +0000 |
tree | 250ec328734ec3f4c219b45bf9beb4a8ba948db2 | |
parent | 5b5789adc1cfb9d0bcf49dd78f6b9e2299773a3f [diff] | |
parent | 570fb0740e9e8df1963ec78a85888e32648b7a6d [diff] |
am af19c7d5: (-s ours) am 1ca439de: am 11d84a57: am 33321cad: am 73456faf: DO NOT MERGE Request FLAG_SHOW_WHEN_LOCKED for respond via text dialogs * commit 'af19c7d54b2958076042cd4ae0fad9ac5736bc96': DO NOT MERGE Request FLAG_SHOW_WHEN_LOCKED for respond via text dialogs