| commit | 3982a90600fbe76c770acc63da1afd77820b254a | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Wed Aug 01 10:45:57 2012 -0700 |
| committer | Makoto Onuki <omakoto@google.com> | Wed Aug 01 10:45:57 2012 -0700 |
| tree | af4077d336124c27b68ef35d704d49593b2fecfc | |
| parent | 87e5f504334ff6ab95ac9c828e2e160aef9cbcc3 [diff] | |
| parent | 67d3ba117d6305f826be33f1d8861e06289fc457 [diff] |
resolved conflicts for merge of 67d3ba11 to jb-mr1-dev Change-Id: I34d8bb04438dad2bfb453e5822fe5cec09dca461