tree 635f2367a68fee71a7ea27ed6065a5a0993f5baf
parent 3efb17f6b41a81910ffa7fa5ea7c11b9454f7dad
author Eino-Ville Talvala <etalvala@google.com> 1381772389 -0700
committer Eino-Ville Talvala <etalvala@google.com> 1381772389 -0700

DO NOT MERGE: Update SDK@872126 from klp-dev

Both current/ and 19/

Bug: 11141002
Change-Id: I2404bdd59fd0089129e31978188f90383e822b6f