| commit | ca9c13a51da963a6a1d399e774d32da491368519 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Fri Apr 05 18:59:43 2013 -0700 |
| committer | Ying Wang <wangying@google.com> | Fri Apr 05 18:59:43 2013 -0700 |
| tree | fc0fcda09341f155cf6a12e78b28fca00b2a7f5d | |
| parent | beeadda28642792e0c6e79fd842c891882ec9c9b [diff] | |
| parent | 5656a481dd848a31bbd53c50773bfc9f3ee323ea [diff] |
resolved conflicts for merge of 5656a481 to jb-mr2-dev-plus-aosp Change-Id: I9d8dfaf94cd66233c4ae99d73c85152517885965