summaryrefslogtreecommitdiffstats
path: root/include/gui
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2013-04-23 15:54:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-23 15:54:56 -0700
commit1e5baa4e7dcc9610727103714343594240fe693d (patch)
tree0428045fe4af547aa15bf78445548a2a094f647e /include/gui
parent6bbd8e30b5a740cc75615c8c4cff1767107da240 (diff)
parentae5fa5a2f790d5691f52b8000d4a8708d596ccbc (diff)
downloadframeworks_native-1e5baa4e7dcc9610727103714343594240fe693d.zip
frameworks_native-1e5baa4e7dcc9610727103714343594240fe693d.tar.gz
frameworks_native-1e5baa4e7dcc9610727103714343594240fe693d.tar.bz2
am ae5fa5a2: am 3cf12f41: Merge "Add hardware feature android.hardware.bluetooth.le xml file" into jb-mr2-dev
* commit 'ae5fa5a2f790d5691f52b8000d4a8708d596ccbc': Add hardware feature android.hardware.bluetooth.le xml file
Diffstat (limited to 'include/gui')
0 files changed, 0 insertions, 0 deletions