tree 0948dd8627df8a05f24e6a38c881b313505723b5
parent 542ab34c8fb3d9d25dfee408f2b972a2e9406ecf
parent 60d76a3a19e6ebbda9850615fedeacb783a24506
author Jean-Baptiste Queru <jbq@google.com> 1352736622 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1352736626 -0800

Merge from AOSP

Change-Id: I6a85121a3c33e88bac711b1cfa8148f78473a390