tree b021b8ed2cc91fce1a32ec4dc8879635a2bbcdcf
parent 17360079488f34ae94bbedea2f18f6c2b3217f7b
parent f587fd7829fcd2ef42241ef140de203b520a6405
author Jean-Baptiste Queru <jbq@google.com> 1351807605 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1351807610 -0700

Merge from AOSP

Change-Id: Ibca2e9f36bbc8867dec0e2e06624456d51b17e73