OSDN Git Service

resolved conflicts for merge of d3db28a4 to lmp-dev-plus-aosp
authorCalin Juravle <calin@google.com>
Fri, 15 Aug 2014 13:41:48 +0000 (14:41 +0100)
committerCalin Juravle <calin@google.com>
Fri, 15 Aug 2014 14:12:39 +0000 (15:12 +0100)
commite51e37c9da63c237800a4e4f751cd0d61d15f57d
tree8a08b32975f214630536800626d700b3b6ebeba8
parent3076fc1f430cefc2881c82924cb882b071eb98f4
parentd3db28a47fe11e49096078e64f43bb246b519b68
resolved conflicts for merge of d3db28a4 to lmp-dev-plus-aosp

Change-Id: Ibc0771343762a8d1bf875c36262d9cda896e4d2b
runtime/runtime.cc