commit | 5ccbad1a53ab33951722aa01a89100f3ca9fbfa4 | [log] [tgz] |
---|---|---|
author | Amit Mahajan <amitmahajan@google.com> | Tue Jun 30 21:28:57 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 21:28:57 2015 +0000 |
tree | 1166436d28cd83cae21e61cda89b1643bf1f5bf3 | |
parent | e439d3fe8bacde0c13cc20507cd5e0c7db48717b [diff] | |
parent | 986c155e809cc422cfd0d9958958e3676b09612a [diff] |
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 '986c155e809cc422cfd0d9958958e3676b09612a': DO NOT MERGE Change to make STK related intents protected.