tree b021b8ed2cc91fce1a32ec4dc8879635a2bbcdcf
parent 55de9c5b09fe41f782ed6e49b69f8f649181cc84
parent 71a259243efe08529b91660a7d903921a5c93c54
author Jean-Baptiste Queru <jbq@google.com> 1346110747 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1347031505 -0700

Merge from jb-mr1-dev-plus-aosp

Change-Id: Ie818c9b62cccc595b1d8538418d5591eb0538722