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