| commit | 35bd30b184b321754697b992aa5c581e204d530a | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Aug 29 22:10:51 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 29 22:10:52 2013 +0000 |
| tree | 4ed543ffe1f0dafadc291eb300fa7aed05dfb250 | |
| parent | 79a45c6f1837d5921e512213904c96660b1a80b1 [diff] | |
| parent | 7788c61af5927a0fac612ea94d5205eeec2f507f [diff] |
Merge "Merge commit '270226b0' into manualmerge" into klp-dev