tree 3ac1db227e2e1076fc862e9fdb5f01ad55d02cd2
parent e4ed2db2f5b8df29cc7fbfadcaa3ba786346668d
parent c434f71bd887fe4ea3d0f987d26410b7a61c83a2
author Nick Kralevich <nnk@google.com> 1432004288 -0700
committer Nick Kralevich <nnk@google.com> 1432004288 -0700

resolved conflicts for merge of c434f71b to mnc-dev-plus-aosp

Change-Id: I32ebfab7391089d399a00a7b8b63cdc21e46a0ea