| commit | 3f5774a95b34fe0545d449ea9b65ea52ccd9a36c | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Tue Dec 10 10:57:27 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 10:57:27 2013 -0800 |
| tree | 1934e2251da524115b563aea610e4aa8ec17ffc8 | |
| parent | 5292e97461205136b155946319816bf90fa4638c [diff] | |
| parent | a3d0c71a8866c5bb236c96b80f4de0e023680309 [diff] |
am a3d0c71a: am 6818b9cb: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev * commit 'a3d0c71a8866c5bb236c96b80f4de0e023680309':