| commit | 41c2d2cec3f46b28f535e9cd7f5b9da02280ccfe | [log] [tgz] |
|---|---|---|
| author | Jose Lima <joselima@google.com> | Mon Mar 24 22:35:08 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Mar 24 22:35:08 2014 +0000 |
| tree | 4237af1be7802ee2981b912a52143a47d94dc3e3 | |
| parent | 2ddf5166ea1da32f7ac63392f369f8a3c36a16df [diff] | |
| parent | e9118138402b5631e7bea74b1b8b5cbfe24ca097 [diff] |
Merge "resolved conflicts for merge of 6c45157c to master"