| commit | 8073625ea47a0d1bea2f1d6046f8547b3b9a2e2e | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Mon Aug 12 18:13:13 2013 -0700 |
| committer | Qiwen Zhao <zhao@google.com> | Mon Aug 12 18:13:13 2013 -0700 |
| tree | e49de3ae0451580026b981ec5182421f91cf3c1d | |
| parent | 6c25637caf57d9bd31edcc7a342dd7f1e55d6aa7 [diff] | |
| parent | dcba320aa83e0e68a70f883e3f097d2c9e1c78e0 [diff] |
Merge remote-tracking branch 'origin/klp-dev-plus-aosp' into klp-dev-plus-aosp