OSDN Git Service

resolved conflicts for merge of 2258d319 to lmp-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Sat, 30 Aug 2014 01:12:45 +0000 (18:12 -0700)
committerAndreas Gampe <agampe@google.com>
Sat, 30 Aug 2014 01:12:45 +0000 (18:12 -0700)
commit2ec8648ba613c1543b2b02c63158045be73ee348
tree55404f1c376afea624dddeb34714c5b76892f93d
parent87f4e6f1bbdc78b7ebc8970de18008061e35c04d
parent2258d3194dadf14cc8a21b1c17edc7ec1c681bb9
resolved conflicts for merge of 2258d319 to lmp-dev-plus-aosp

Change-Id: I567c32c2111f3f36f26ec0b259c08c867bc34e28
runtime/parsed_options.cc