| commit | b7ce6cca79f559462368f88812792ae6e401f3f1 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Fri Oct 31 11:10:38 2014 -0700 |
| committer | Andrew Hsieh <andrewhsieh@google.com> | Fri Oct 31 11:10:38 2014 -0700 |
| tree | eed8f795578786c113abffab5e9c93375fb26c6f | |
| parent | db74fee7dbbf0b5208c8777c8ee904230fded75e [diff] | |
| parent | 473dde00ceca7ff4d07d47dc4e077bb89988fc53 [diff] |
resolved conflicts for merge of 473dde00 to lmp-mr1-dev-plus-aosp Change-Id: I179da4645fd1d023a669a8db02a370ab680af106