| commit | 0dfb355a92f1342fdf58924efc86104394fdab49 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Feb 20 00:30:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 20 00:30:59 2015 +0000 |
| tree | 1b7a75184891c205f04532a278db30b1100df5d0 | |
| parent | a90c9c4d3b2cd7fa21089c0683ad6ab640edb73b [diff] | |
| parent | 12a6d7157f9cb7117779f4df90749e4ef7755dca [diff] |
am 12a6d715: am 02eaba63: Merge commit \'05ac86c036cb79836e183f6ab4e810bd23bffe32\' into HEAD * commit '12a6d7157f9cb7117779f4df90749e4ef7755dca':