| commit | 538795962a684dc35c4a7aaa0c31457ebf578ac6 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Tue Jun 30 22:03:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 22:03:16 2015 +0000 |
| tree | 7b4cfcb76b94188e5da714192ea07ba0111bf071 | |
| parent | 90b2bd4e2ec4bb2f0d1813a07ebf4f67e9dca4b2 [diff] | |
| parent | 5ccbad1a53ab33951722aa01a89100f3ca9fbfa4 [diff] |
am 5ccbad1a: am 986c155e: am 44919014: am f4d6776f: am 91097b59: am b8ef3a2c: (-s ours) am 624392ed: am c0e53271: DO NOT MERGE Change to make STK related intents protected. * commit '5ccbad1a53ab33951722aa01a89100f3ca9fbfa4': DO NOT MERGE Change to make STK related intents protected.