| commit | 42ae4cf2ce5ba02c2211813452badc07eab33735 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Fri Mar 07 18:26:19 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 07 18:26:19 2014 +0000 |
| tree | 19f59abb78c92ba4acbcd9db92670cec0e8a6a70 | |
| parent | 4ee594e30529b0e4a89c829488dce4d58457c371 [diff] | |
| parent | e648c19bf33ce78b3f67b7ffd95c92fd6996c418 [diff] |
Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into klp-dev-plus-aosp