| commit | c5fb159ead919884cf12d09a6935a0105d5c49af | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jun 17 23:18:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 17 23:18:00 2015 +0000 |
| tree | db0330a7209f45d94c0ae2c019557154c1fe897c | |
| parent | ad94a470e7deb0ea257a988e53f1b53aef4eb0e1 [diff] | |
| parent | 6ba0e96b968dcf7e0c73ac033bf3bc8f8c6c8964 [diff] |
am 6ba0e96b: Merge "AppSecurityTests: Do not delete in WhiteLists." into kitkat-cts-dev automerge: ac79e25 automerge: 23c49fb * commit '6ba0e96b968dcf7e0c73ac033bf3bc8f8c6c8964': AppSecurityTests: Do not delete in WhiteLists.