tree 4448c702d8119d90081c0ecc354197e95cbeceef
parent bde3269295f1078457deb12cd42ef2b66efbbc46
parent b5125b0f8f312a41fa3ac4c9ebd9f474b578b51b
author Jean-Baptiste Queru <jbq@google.com> 1355872448 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1355872452 -0800

Merge from AOSP staging branch

Change-Id: Iad3df4845e6fae16c4ae6dbddcad0121d4775dcd