| commit | 5630521aba12a03637e7328686924df4d298ff4d | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Wed Sep 12 15:27:59 2012 -0700 |
| committer | Andrew Hsieh <andrewhsieh@google.com> | Wed Sep 12 15:27:59 2012 -0700 |
| tree | e98a11812008c753ac2e01e84f3301967532d221 | |
| parent | 063d0c5deefc1cda1027a9241dbaf338cac35be0 [diff] | |
| parent | 3e91f5ad763983af56f54d794045f451265f8d91 [diff] |
resolved conflicts for merge of 3e91f5ad to jb-mr1-dev Change-Id: I9b587bc6086e1edacc98879e43668001bf72f7db