| commit | f6fd0d1ef24c6ce4b02df09276a17614e930c25a | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Sat Jun 27 06:48:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 27 06:48:14 2015 +0000 |
| tree | e4107676fd8c425ecc355c4863af67dba835b9c4 | |
| parent | c3f64efd42f9f524eab05e01b7171ffc587d5b28 [diff] | |
| parent | 4d78f80d151f9b4bf7dd414912bfba005c824b1f [diff] |
am 4d78f80d: am 735dff74: am c64048a2: am 904df6db: Merge commit \'8919b945\' into manualmerge * commit '4d78f80d151f9b4bf7dd414912bfba005c824b1f': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.