| commit | 3a1c29b106f8ef4e8aba2bf0c722f3650c6f255c | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 30 12:50:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:50:00 2014 +0000 |
| tree | 43f7e55387f2b7743afabf6d248e6876f5c02190 | |
| parent | 4ed8275195e61fbdd588fd07f4721f54e1f554db [diff] | |
| parent | bc1f9135667d8cd5817374f6d0d3d5d20bd05f6f [diff] |
am bc1f9135: am 2c994982: Merge commit \'469beca0970c2468f35bb25887e701b6305ba652\' into HEAD * commit 'bc1f9135667d8cd5817374f6d0d3d5d20bd05f6f':