| commit | e06a87d338250a267ae904830ec8e1047253bc11 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Fri Jun 26 23:44:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 23:44:54 2015 +0000 |
| tree | 58a4251bd0f7d53714c8df74447eece3654f1bfa | |
| parent | d5654147c28d36bd3724796f5eaf598a2b0589f9 [diff] | |
| parent | 90b2bd4e2ec4bb2f0d1813a07ebf4f67e9dca4b2 [diff] |
am 90b2bd4e: (-s ours) am e439d3fe: am 31cea46d: am 06a37b5c: am 9bf9e12b: am 42da80fe: DO NOT MERGE Change to make STK related intents protected. * commit '90b2bd4e2ec4bb2f0d1813a07ebf4f67e9dca4b2': DO NOT MERGE Change to make STK related intents protected.