tree 6b5a1d5c89695f45d475bdbc85b210e9675ea20c
parent 39d890d9aed5cb07b8a166a749299b9d24d8f137
parent 22d0bdf326de00dd50a388b55540123228cbb025
author Dan Stoza <stoza@google.com> 1422389193 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1422389194 +0000

Merge "resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp