| commit | 6f4f68a9720b92d1640ff8c48efc6bb4d0a9ae83 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Mar 10 13:11:30 2014 -0700 |
| committer | Colin Cross <ccross@android.com> | Mon Mar 10 13:11:30 2014 -0700 |
| tree | f63bc79eab507400bf028ad728ad9fa09e461098 | |
| parent | 4bfeea4473b710fa78992e392748e0e03879d9d6 [diff] | |
| parent | fbef82d10366495bbd0dbb30cea015cb67c8105a [diff] |
resolved conflicts for merge of fbef82d1 to klp-dev-plus-aosp Change-Id: I7ec85f26fc1f94324fbb57c031d760098d2f76cb