| commit | ee1ded17fd3551055071b9db3d6a8a38c58db267 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Oct 08 21:33:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 08 21:33:00 2015 +0000 |
| tree | cb129436a091fb51a7d8801b59a406c4eae800f9 | |
| parent | f4f3b06cf832cfc61f4cbd6c98db296e214b9659 [diff] | |
| parent | 53aa3d0b8c5121697e06ca4dc458bbc7ed636046 [diff] |
am 53aa3d0b: Merge commit \'12de240152b8b0147b83d800bf69f4fb635dc2d3\' into HEAD * commit '53aa3d0b8c5121697e06ca4dc458bbc7ed636046':