| commit | c9b605d1644ae55998d97c0374450c376f9b9c84 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Fri Jun 26 23:53:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 23:53:43 2015 +0000 |
| tree | 649b425709ab23b5af9b80dcd0c74128ead7a09a | |
| parent | c5344a2406ada9be5f42f70e4c7789480dbc22c9 [diff] | |
| parent | e06a87d338250a267ae904830ec8e1047253bc11 [diff] |
am e06a87d3: 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 'e06a87d338250a267ae904830ec8e1047253bc11': DO NOT MERGE Change to make STK related intents protected.