| commit | 2165776685089613021f6ec6b34205d936dc2da1 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Tue Dec 10 01:58:28 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 01:58:28 2013 +0000 |
| tree | 85f6bcab854c21341b3f27a661c46b752a131d3d | |
| parent | 44c0b09b7b4961b04d5437e773c55fde78034d5e [diff] | |
| parent | a924e71c93511ac0ad5456ec3a1ca7dfd35f2c79 [diff] |
am a924e71c: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev * commit 'a924e71c93511ac0ad5456ec3a1ca7dfd35f2c79':