| commit | b4bbf8878c3a6b2a17a3a96f1a23300748dbd81a | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@google.com> | Tue Mar 18 10:56:32 2014 -0700 |
| committer | Doug Zongker <dougz@google.com> | Tue Mar 18 10:56:32 2014 -0700 |
| tree | eb94c2b19dd8b6af5cdae489f825d78a05430bfb | |
| parent | 47c7e365071f75489604b2d0ba3109fe39bac1ef [diff] | |
| parent | 708aa23801b0bc8349ab017c92c0deaf9d767c52 [diff] |
resolved conflicts for merge of 708aa238 to klp-modular-dev-plus-aosp Change-Id: I3d00437d519f93652ccae6b361e89e853ccae9b3