summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorNicolas Prevot <nprevot@google.com>2014-08-18 19:29:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-18 19:29:14 +0000
commit95f9f8535d072c87efdb850730e7a864dfa97061 (patch)
treed462ad61fc5d3ad586d124b9a9204a30ca3df222 /rs
parent00eea5072bffe14558fdde184d79ef0b150910fe (diff)
parentb883a449d3b68f0b1ea4066a6245ec0207747f5c (diff)
downloadframeworks_base-95f9f8535d072c87efdb850730e7a864dfa97061.zip
frameworks_base-95f9f8535d072c87efdb850730e7a864dfa97061.tar.gz
frameworks_base-95f9f8535d072c87efdb850730e7a864dfa97061.tar.bz2
am 3eb16dc4: am cdc4b08c: Merge "When forwarding intents, ignoring the package set in the intent." into lmp-dev
* commit '3eb16dc478c0cacbf770d35b41d96448a0e96654': When forwarding intents, ignoring the package set in the intent.
Diffstat (limited to 'rs')
0 files changed, 0 insertions, 0 deletions