| commit | 8ab25d82b56c7604dc945e4385b74a75de093e56 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Sep 19 16:13:49 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Fri Sep 19 16:13:49 2014 -0700 |
| tree | 7f112dd6a95cacfc2f6322f06f346162820ed23f | |
| parent | 0e3b5a7986a7304c2239d35796a60e59b8076c55 [diff] | |
| parent | 1a4527ce9449d913e7a60dc3784520006d8955b7 [diff] |
resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp Change-Id: If649bd9ef98181a1e1e341cc5b73d237586fb72c