| commit | 129847526a198182677a84f83e30e91a61341531 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Wed Sep 04 17:14:33 2013 -0700 |
| committer | Andrew Hsieh <andrewhsieh@google.com> | Wed Sep 04 17:14:33 2013 -0700 |
| tree | 2f3ffdc3acbed30a31b3638f903020c38d8b04cf | |
| parent | 072248aa5bac9985e23d68b4d2a38074096751bc [diff] | |
| parent | fcdf653a1779a744c59269f331c6584f84bfd091 [diff] |
resolved conflicts for merge of fcdf653a to klp-dev-plus-aosp Change-Id: I1d831bbb4649b2ddc89cdfb71e3b76712bc6469e