Sebastien Hertz b60bc0ece2 resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev ...

Change-Id: I4cb38241b5efab1eb7af161e1589fa477a473a39

2015-08-21 09:53:41 +02:00

..

android_runtime

Allow debugging only for apps forked from zygote

2015-08-19 11:25:56 +02:00

androidfw

Merge "Fix UB in ResourceTable::stringToInt."

2015-04-14 23:25:27 +00:00

private

Merge "Add kModeSync" into lmp-dev

2014-07-24 20:48:02 +00:00

storage

…