| commit | 7d776143efb216cf4edfcd50a69668aef331df2a | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Aug 27 23:37:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 23:37:44 2015 +0000 |
| tree | 0381ec897737ab737233981b4d68477347bd088a | |
| parent | 4c0e66a6eff7e9c2ad144cae286ab1847c7e6b5d [diff] | |
| parent | ce65f99d9f93fa23c8854036ffc1fe21019c6194 [diff] |
am 35cee267: Merge commit \'f4ba463105646df0c4d65c368fbd201cfe62d08f\' into HEAD * commit '35cee267338c5b290dff99365cc734aa60e0f773':