tree 2a3a9de303392f01a8bc2c5d5c0dceb567b8ca0a
parent 6746717209435aac27eedeebdf67da1a1fbc5e5a
parent f4471c7e6ca7a0bd4846b2fe4fbe78d79ef37b81
author Matthew Xie <mattx@google.com> 1395689860 -0700
committer Matthew Xie <mattx@google.com> 1395689860 -0700

resolved conflicts for merge of f4471c7e to klp-modular-dev

Change-Id: I89ce6df8f59efa8cee63775eff58262ecf438db3