| commit | 0172fb4781018562237c7dcb4dfc2717e75093a2 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Wed Apr 17 22:13:24 2013 -0700 |
| committer | Xavier Ducrohet <xav@android.com> | Wed Apr 17 22:13:44 2013 -0700 |
| tree | 4caee4a583db7dcb356d7fa31d7a74f7f6cdaf7a | |
| parent | 6a32de3eb4939b5e6c0444a8a2e5de6967dc8e7b [diff] | |
| parent | 950f844bf459d8246154fe46ecef5f8ba5e9aa13 [diff] |
resolved conflicts for merge of 950f844b to jb-mr2-dev-plus-aosp Change-Id: Ie29f7428c461b7b264b49cf7ad5fc9e2b71376fe