tree a88f37a0cc0a9229fa2ad327c25f9c07595944bd
parent 8724d359bfe1f95fd4c558b55069e1624b461f28
parent 0820394f7e4ca089a4210f21ed427871d96c793e
author Rich Slogar <rslogar@google.com> 1430429264 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1430429265 +0000

Merge "resolved conflicts for merge of edf44562 to mnc-dev" into mnc-dev