OSDN Git Service

am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
authorJohn Spurlock <jspurlock@google.com>
Fri, 4 Apr 2014 19:28:09 +0000 (19:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Apr 2014 19:28:09 +0000 (19:28 +0000)
commit642421aa7f284817cc1a972a7f9c7a64696a0116
treee51a5b2c212bd95c4a052fcbd6b0bb0f0fce4976
parent8f81d29558bb0c97187d5ae3a7ee696ec13b264a
parent5c31e487c4577e1c47ee7c949325d6a13f0d462e
am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev

* commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
api/current.txt
include/androidfw/ResourceTypes.h
libs/androidfw/ResourceTypes.cpp
tools/aapt/AaptAssets.cpp