OSDN Git Service

resolved conflicts for merge of 307f6508 to lmp-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Fri, 25 Jul 2014 18:38:28 +0000 (11:38 -0700)
committerAndreas Gampe <agampe@google.com>
Fri, 25 Jul 2014 18:39:45 +0000 (11:39 -0700)
commitb3c3f9384f3ba864baac1ea7d0f7ed6e9c125ff2
tree3fb92c60ac805ea2e216aa229548f46cc1518054
parent749647c974791ce91e179e465f0b275d6cf54111
parent307f650806e55ea54e7562a25a20b4b79f65271b
resolved conflicts for merge of 307f6508 to lmp-dev-plus-aosp

Change-Id: If49761765f3346993fb67068e79dad65e161c6a5
runtime/thread.cc