commit | 3bca0c0d3a91b0ba28c67dec83830af5000bedca | [log] [tgz] |
---|---|---|
author | Amit Mahajan <amitmahajan@google.com> | Fri Jun 26 23:41:21 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 23:41:21 2015 +0000 |
tree | 649b425709ab23b5af9b80dcd0c74128ead7a09a | |
parent | 9efd4eec75d0648b0a129e391f5ecace6686ebe3 [diff] | |
parent | c5344a2406ada9be5f42f70e4c7789480dbc22c9 [diff] |
am c5344a24: am d5654147: am f7ed8208: (-s ours) am 9bf926f5: am a46312c4: am 2a4cc576: DO NOT MERGE Change to make STK related intents protected. * commit 'c5344a2406ada9be5f42f70e4c7789480dbc22c9': DO NOT MERGE Change to make STK related intents protected.