| commit | 791a5a6a3c8e89fd6c442a8ebac4019ace892276 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Fri Oct 04 12:57:05 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 04 12:57:05 2013 -0700 |
| tree | 58230d6c9abb50fcf3ed960214d462097d09a92b | |
| parent | 6594318e7db5998c4be634ca0ec957d4115706d3 [diff] | |
| parent | 06ba3ef19fba91dcb9071cadc4b4bd4d0b454366 [diff] |
am 06ba3ef1: (-s ours) am 551a1c24: reset to klp-dev branch to fix merging problem. * commit '06ba3ef19fba91dcb9071cadc4b4bd4d0b454366':