tree d7e56eb7050fb5d8a922bc0a32d616677d215f52
parent c36cc3b59879b0c46aea81b6ee746c40c591abf6
parent a9aa02cc4cf7520aa2f4348235e3ff637fe024f3
author Jean-Baptiste Queru <jbq@google.com> 1335371593 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1335371595 -0700

Merge from AOSP

Change-Id: Iae692bc1c54ffc241fd6853bbbdab19688c4f46b