| commit | 7acc700b50d3c2d1b8181595f0365dc369bf0789 | [log] [tgz] |
|---|---|---|
| author | Paul Westbrook <pwestbro@google.com> | Sun Nov 02 11:44:17 2014 -0800 |
| committer | Paul Westbrook <pwestbro@google.com> | Sun Nov 02 11:44:17 2014 -0800 |
| tree | d0da18a4f8ba3cb1a1eece92d196fafe731932a2 | |
| parent | 378b5200a5a1ed8599f4b0303be1721c69570e71 [diff] | |
| parent | 7bcf66fb986cdf7d2e38d956f04c0239436dedd7 [diff] |
resolved conflicts for merge of 7bcf66fb to lmp-mr1-dev-plus-aosp Change-Id: Ic0a58a80f26b25b6aeb0aa8f817d67a8ee53bf51