| commit | fc8b6338510690f1f87c57b9d9c470e25fc48bcd | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Aug 15 12:02:30 2013 -0700 |
| committer | Ying Wang <wangying@google.com> | Thu Aug 15 12:02:30 2013 -0700 |
| tree | e0977cd54677f98fc981a1ab536bc5d7d157819b | |
| parent | fb2188d1390841285181256a0ec37c5558c971da [diff] | |
| parent | d65a7da3206b8d369886532ab83c0bfce31ec01a [diff] |
resolved conflicts for merge of d65a7da3 to jb-mr2-dev-plus-aosp Change-Id: I14c4ddf5f02c8dec86f45bedf679bcebff1448dc