| commit | 76d82156a817252f08890c85dc11f31c07aed1f9 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Wed Jul 01 17:24:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 01 17:24:41 2015 +0000 |
| tree | 4347be81d6d6abd7f4dc32b638b25ac22bd7e12f | |
| parent | 5c000ae700757688209a961a2c2b8d42a01c8a98 [diff] | |
| parent | 5c2f0e6b834353841c013270ab7dfe55b130d7a0 [diff] |
am 5c2f0e6b: 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 '5c2f0e6b834353841c013270ab7dfe55b130d7a0': DO NOT MERGE Change to make STK related intents protected.