| commit | 7041bd271801bbb6552ef60f054bf8b83182cf4f | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Wed Oct 02 12:17:04 2013 -0700 |
| committer | Unsuk Jung <unsuk@google.com> | Wed Oct 02 12:17:04 2013 -0700 |
| tree | 493301e7867eecaf93c5b484f8d5525e58f1929c | |
| parent | a11f93cd688af1dcba0ddcc43fdbd888cfb1bcc2 [diff] | |
| parent | 36468a88015b2d90caabf22a0e6fa981d5aa60a1 [diff] |
resolved conflicts for merge of 36468a88 to jb-mr2-dev Change-Id: Ic35f8dc0943af418b1a6b954511d845a7fa23f09