Nicolas Prevot 92ebe9a289 am b06aece7: am d16f1252: am 60373e80: Merge "Fix the case where an intent bounces several times between users." into mnc-dev ...

* commit 'b06aece751cc86aa859005bbb8843c5ed6be7c6f':
  Fix the case where an intent bounces several times between users.

2015-07-04 08:06:54 +00:00

..

java/com/android/server

am b06aece7: am d16f1252: am 60373e80: Merge "Fix the case where an intent bounces several times between users." into mnc-dev

2015-07-04 08:06:54 +00:00

jni

am bba9d27e: am 1d50879b: Merge "Remove memory leak in PersistentDataBlockService jni"

2015-07-01 13:57:32 +00:00

Android.mk

resolved conflicts for merge of 962a11ad to master

2015-03-31 11:15:39 +01:00