| commit | 986c155e809cc422cfd0d9958958e3676b09612a | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Tue Jun 30 20:11:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 20:11:51 2015 +0000 |
| tree | e1b90f41323edaf919d50344daecfbd15425ac5e | |
| parent | 31cea46d178626fce1d3b47a8f9796ce379b1773 [diff] | |
| parent | 449190144af361d8572d7b16471f1348fdcb4060 [diff] |
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 '449190144af361d8572d7b16471f1348fdcb4060': DO NOT MERGE Change to make STK related intents protected.