OSDN Git Service

resolved conflicts for merge of c434f71b to mnc-dev-plus-aosp
authorNick Kralevich <nnk@google.com>
Tue, 19 May 2015 02:58:08 +0000 (19:58 -0700)
committerNick Kralevich <nnk@google.com>
Tue, 19 May 2015 02:58:08 +0000 (19:58 -0700)
commit7e7341f662e7cd25054b11a858a8e1137000b4e0
tree3ac1db227e2e1076fc862e9fdb5f01ad55d02cd2
parente4ed2db2f5b8df29cc7fbfadcaa3ba786346668d
parentc434f71bd887fe4ea3d0f987d26410b7a61c83a2
resolved conflicts for merge of c434f71b to mnc-dev-plus-aosp

Change-Id: I32ebfab7391089d399a00a7b8b63cdc21e46a0ea