commit | c898074def75569576dc3e6ac0ca1abacaa64d50 | [log] [tgz] |
---|---|---|
author | Amit Mahajan <amitmahajan@google.com> | Sat Jun 27 00:11:15 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 27 00:11:15 2015 +0000 |
tree | 649b425709ab23b5af9b80dcd0c74128ead7a09a | |
parent | 3bca0c0d3a91b0ba28c67dec83830af5000bedca [diff] | |
parent | c9b605d1644ae55998d97c0374450c376f9b9c84 [diff] |
am c9b605d1: am e06a87d3: am 90b2bd4e: (-s ours) am e439d3fe: am 31cea46d: am 06a37b5c: am 9bf9e12b: am 42da80fe: DO NOT MERGE Change to make STK related intents protected. * commit 'c9b605d1644ae55998d97c0374450c376f9b9c84': DO NOT MERGE Change to make STK related intents protected.