| commit | fc3bbe64bb7fb93e7337a8a58fa549c9e37cce98 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Sat Jun 27 17:13:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 27 17:13:42 2015 +0000 |
| tree | bdf477399763412dc72008b69ee2a5e3fa299c69 | |
| parent | ddd73ee628e5e898a5257b3768f5f17bea8d196e [diff] | |
| parent | e284a0ce1eafd540f72d83e914efe68d49850aea [diff] |
am e284a0ce: am bb3c04f7: Merge commit \'59982e0d\' into mm * commit 'e284a0ce1eafd540f72d83e914efe68d49850aea': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.