summaryrefslogtreecommitdiffstats
path: root/obex
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2015-03-02 19:47:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-02 19:47:29 +0000
commitbf815f495270b466e53bec20772b41ff4397ac83 (patch)
tree455cb23a288d9f1dc422153242440a88a191cb01 /obex
parent98a57a1ab8da73f6b328082f31c6c6732108cf2b (diff)
parent7b4caab1a87b659498d30af194ae511526c503ba (diff)
downloadframeworks_base-bf815f495270b466e53bec20772b41ff4397ac83.zip
frameworks_base-bf815f495270b466e53bec20772b41ff4397ac83.tar.gz
frameworks_base-bf815f495270b466e53bec20772b41ff4397ac83.tar.bz2
am 7b4caab1: am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev
* commit '7b4caab1a87b659498d30af194ae511526c503ba': Add status bar time for 5.1
Diffstat (limited to 'obex')
0 files changed, 0 insertions, 0 deletions