commit | 5c2f0e6b834353841c013270ab7dfe55b130d7a0 | [log] [tgz] |
---|---|---|
author | Amit Mahajan <amitmahajan@google.com> | Wed Jul 01 17:13:07 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 01 17:13:07 2015 +0000 |
tree | d9d0ff91da5c7c9f8fcfc11cd7f80664e8a8ed1b | |
parent | ae7dc63b997ddab41a1fbf9db59d18322ce49ef8 [diff] | |
parent | 538795962a684dc35c4a7aaa0c31457ebf578ac6 [diff] |
am 53879596: (-s ours) 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 '538795962a684dc35c4a7aaa0c31457ebf578ac6': DO NOT MERGE Change to make STK related intents protected.