OSDN Git Service

resolved conflicts for merge of 5c7bc931 to lmp-mr1-dev-plus-aosp
authorYing Wang <wangying@google.com>
Mon, 17 Nov 2014 18:53:46 +0000 (10:53 -0800)
committerYing Wang <wangying@google.com>
Mon, 17 Nov 2014 18:56:26 +0000 (10:56 -0800)
commitc2045047735522f50bc1d2618280bd37306f18d2
tree99b4b7be6ceba782fe0328899592058a6bdda79a
parente726680652ecd235496afeb3207b463e0aa83955
parent5c7bc931270f8b0955dddadac9ce6247217a9e3e
resolved conflicts for merge of 5c7bc931 to lmp-mr1-dev-plus-aosp

Change-Id: Id3130cf4a23f07953e06301fe93f1da54b9ca191
core/java/com/android/internal/os/ZygoteInit.java