| commit | e648c19bf33ce78b3f67b7ffd95c92fd6996c418 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Thu Mar 06 20:06:08 2014 -0500 |
| committer | Leon Scroggins III <scroggo@google.com> | Thu Mar 06 20:10:19 2014 -0500 |
| tree | 0f6ac2a09992d7492e80ac83e99ff25ed47bba72 | |
| parent | ad7c2c2d8d8fa38d56a61aedb4ce158cb69a2d01 [diff] | |
| parent | 8d3281f5f7a880b996e50d291ebb7154a486eb6c [diff] |
resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp Change-Id: If2855ff4f7a1e7645c69af378955868f44187376