OSDN Git Service

resolved conflicts for merge of 952b1642 to mnc-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Mon, 1 Jun 2015 18:47:09 +0000 (11:47 -0700)
committerAndreas Gampe <agampe@google.com>
Mon, 1 Jun 2015 18:47:09 +0000 (11:47 -0700)
commit6139f54a61d0da9db5b7792197b7062514238885
tree29b079f840d55ecd1c9a7ebc643e8831802e4913
parent11a97022f57a1af3faebfade17b9f18f256c228e
parent952b16428c8eef0e2facc8dd7fffbdb586352ab5
resolved conflicts for merge of 952b1642 to mnc-dev-plus-aosp

Change-Id: I6d8b7a0d55cca998e1241acc855e606b7f769609