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

Merge from AOSP

Change-Id: I0c9f2e0bb730a2e3f789d278aabd57965f0afea2