tree 1fa49de77d453e0e3a6974ee52ed03cbac61975a
parent b63fac4ffb1101be501886bc1c9c79ae5795276c
parent 910cfd519908eef792e4bb375135aa1599258949
author Deepanshu Gupta <deepanshu@google.com> 1402096250 -0700
committer Deepanshu Gupta <deepanshu@google.com> 1402096250 -0700

Merge 910cfd from klp-modular-dev to klp-modular-dev-plus-aosp

Manually merge 910cfd519908eef792e4bb375135aa1599258949 from
klp-modular-dev to klp-modular-dev-plus-aosp