OSDN Git Service

resolved conflicts for merge of cc9894c8 to klp-modular-dev-plus-aosp
authorJeff Brown <jeffbrown@google.com>
Wed, 12 Mar 2014 04:01:49 +0000 (21:01 -0700)
committerJeff Brown <jeffbrown@google.com>
Wed, 12 Mar 2014 04:01:49 +0000 (21:01 -0700)
commitec463b96e188f2c68cbef2362e570118a3a460ed
tree23e39de94339113633ca0894635a51d4ada12f1b
parentc48701a134d3ba05e35d94da921abe1120b67185
parentcc9894c82559d63b1ae89635b0ae9965e03d598e
resolved conflicts for merge of cc9894c8 to klp-modular-dev-plus-aosp

Change-Id: I0fa4486ed300a35de3af8748e01300b01f03ec01
core/java/android/app/ActivityThread.java
core/java/android/app/ContextImpl.java
core/java/android/app/LoadedApk.java