← Back to branch summary

~vanvugt/mir/earlier-release

~vanvugt/mir/earlier-release

Viewing all changes in revision 2825.

Committer: Daniel van Vugt
Date: 2015-08-18 01:35:15 UTC
mfrom: (2798.1.51 trunk)
Revision ID: daniel.van.vugt@canonical.com-20150818013515-tjwa9ochp2rwpz7h

Merge latest trunk

files removed:
3rd_party/android-deps/cutils/uio.h

files modified:
3rd_party/android-deps/android/log.h

3rd_party/android-deps/cutils/log.h

3rd_party/android-deps/cutils/logd.h

3rd_party/android-deps/std/atomic.h

3rd_party/android-deps/utils/KeyedVector.h

3rd_party/android-deps/utils/RefBase.h

3rd_party/android-deps/utils/String16.h

3rd_party/android-deps/utils/StrongPointer.h

3rd_party/android-deps/utils/Timers.h

3rd_party/android-deps/utils/TypeHelpers.h

3rd_party/android-input/android/frameworks/base/services/input/Input.cpp

3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp

3rd_party/android-input/android/frameworks/native/include/utils/BitSet.h

3rd_party/android-input/android/frameworks/native/libs/utils/Timers.cpp

Show diffs side-by-side

added added

removed removed

3rd_party/android-deps/android/log.h

3rd_party/android-deps/cutils/log.h

3rd_party/android-deps/cutils/logd.h

3rd_party/android-deps/cutils/uio.h

3rd_party/android-deps/std/atomic.h

3rd_party/android-deps/utils/KeyedVector.h

3rd_party/android-deps/utils/RefBase.h

3rd_party/android-deps/utils/String16.h

3rd_party/android-deps/utils/StrongPointer.h

3rd_party/android-deps/utils/Timers.h

3rd_party/android-deps/utils/TypeHelpers.h

3rd_party/android-input/android/frameworks/base/services/input/Input.cpp

3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp

3rd_party/android-input/android/frameworks/native/include/utils/BitSet.h

3rd_party/android-input/android/frameworks/native/libs/utils/Timers.cpp

Older »