| commit | 2385bc2971e96f39d8d38533a5fd1f943f8de61c | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Wed Jan 15 17:13:25 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 15 17:13:25 2014 -0800 |
| tree | 65f8ad5585bf567f23c82d9cc1f7691da6ba69f3 | |
| parent | 25e1fc1d9945cb8110a069d9f54e1f884b7c35f9 [diff] | |
| parent | af052deac87840e2a3af6335376020adc0f0fde3 [diff] |
am af052dea: am 51fb1113: (-s ours) am 0f7eb7ee: fix the build. * commit 'af052deac87840e2a3af6335376020adc0f0fde3': fix the build.