| commit | 06ba3ef19fba91dcb9071cadc4b4bd4d0b454366 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Fri Oct 04 12:30:48 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 04 12:30:48 2013 -0700 |
| tree | 4a8d35aa01fed1590f522678d1c3b8dde1d48dfb | |
| parent | 5ce9603784423f6dfa4f0654b0b104591f7ac1ae [diff] | |
| parent | 551a1c246ff348353a57ea3be13aa419457923f5 [diff] |
am 551a1c24: reset to klp-dev branch to fix merging problem. * commit '551a1c246ff348353a57ea3be13aa419457923f5':