| commit | a1df1a778826742eeef11ed449bcffb95e119c80 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Feb 20 00:22:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 20 00:22:48 2015 +0000 |
| tree | b4e77beaa28fb350fd94ad2f9dbc1e032bdc39a1 | |
| parent | 9613bd32f5d19476063e4c546ad806385eed203c [diff] | |
| parent | c2b60b9870955c14ec8434353d617ebca6f44368 [diff] |
am c2b60b98: Merge commit \'f8dd04e1a5f94e7accf65a5375114ac7fa73f828\' into HEAD * commit 'c2b60b9870955c14ec8434353d617ebca6f44368':