| commit | e133e7e49e75c96eefb66d86a9a623d6b0f3561d | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed May 13 23:13:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 13 23:13:46 2015 +0000 |
| tree | ad80c7dd9f8552249074a617e22f486ddab1de00 | |
| parent | 58a5aa4c7e50322a5df1bc474eb870952464c0a7 [diff] | |
| parent | 44d00c7f9a1a5970959ab98ef31982a8a3e9639e [diff] |
am 44d00c7f: am ea9590aa: am c7eb66a9: am 3b6f86c9: Merge "Fix NVMAP_IOC_FROM_ID test" into lollipop-mr1-cts-dev * commit '44d00c7f9a1a5970959ab98ef31982a8a3e9639e': Fix NVMAP_IOC_FROM_ID test