summaryrefslogtreecommitdiffstats
path: root/native/android/asset_manager.cpp
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-02-12 21:01:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-12 21:01:47 +0000
commit8dfda07dd410c1776c6b0d373229fe77c76f8cfc (patch)
treea702eeb283a1c3685093eb4a6d21015940e0fcdd /native/android/asset_manager.cpp
parentae5708db9d02433027f4574f912def6558805642 (diff)
parent731c30c17dac51e2279f8f789a647c61bd55028b (diff)
downloadframeworks_base-8dfda07dd410c1776c6b0d373229fe77c76f8cfc.zip
frameworks_base-8dfda07dd410c1776c6b0d373229fe77c76f8cfc.tar.gz
frameworks_base-8dfda07dd410c1776c6b0d373229fe77c76f8cfc.tar.bz2
am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev
* commit '731c30c17dac51e2279f8f789a647c61bd55028b': Don't add windows from exiting app tokens twice.
Diffstat (limited to 'native/android/asset_manager.cpp')
0 files changed, 0 insertions, 0 deletions