Commits
Romain Guy authored and Android Git Automerger committed 6f4a52a3f7cM
am 67e9e9df: Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE Merge commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e' into eclair-plus-aosp * commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e': Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE
Showing diff to6c71d476f32