| commit | f965ebbdfddf7070ab1807a49b203e76e58b7e4e | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Mar 28 16:07:27 2014 -0700 |
| committer | Colin Cross <ccross@android.com> | Fri Mar 28 16:07:27 2014 -0700 |
| tree | 2264f009670ee2dfb3c232a6b66830a4b8734f6e | |
| parent | 73f561e7657a1afe3d4be888bb22c4af4f729e33 [diff] | |
| parent | 917bb0e20a146a3ab4f7b0cebc4465d0806d0181 [diff] |
resolved conflicts for merge of 063fa2d9 to master-nova Change-Id: Iaa921a78fb59185404d24b6a4245ae2cb691ea5f