summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEADThe Android Open Source Project2013-11-22215-4723/+24509
|\ | | | | | | Change-Id: I5c469a4b738629d99d721cad7ded02d6c35f56d5
| * am 169c12b5: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\ | | | | | | | | | * commit '169c12b5cf55d9574f98935d5517d20f55f62be8':
| | * merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| | |\
| | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-090-0/+0
| | | |\ | | |/ /
| | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-010-0/+0
| | | |\
| | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-290-0/+0
| | | | |\
| | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-250-0/+0
| | | | | |\
| | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-240-0/+0
| | | | | | |\
| | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-220-0/+0
| | | | | | | |\
| * | | | | | | \ am 2f924ebe: am a94d2b39: Merge "Add a restorecon_recursive built-in command ↵Nick Kralevich2013-10-104-3/+24
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to init." * commit '2f924ebe0b0891dba1996c246839427b23705018': Add a restorecon_recursive built-in command to init.
| * \ \ \ \ \ \ \ \ am 4ff9c3f7: am aab1670b: Merge "Add support for ECDSA P-256 with SHA256"Kenny Root2013-10-1016-34/+2580
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4ff9c3f7d89fe418290288d0925f257f0fe15f20': Add support for ECDSA P-256 with SHA256
| * \ \ \ \ \ \ \ \ \ am 45ddf184: am 9b8a929d: Merge "libcutils doesn\'t need to be looking at ↵Elliott Hughes2013-10-101-5/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bionic\'s privates." * commit '45ddf184960225862c6e178588034cce676683e3': libcutils doesn't need to be looking at bionic's privates.
| * \ \ \ \ \ \ \ \ \ \ am 5baecee3: am be18538d: Merge "Cleanup x86 flags and memset versions"Elliott Hughes2013-10-103-21/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5baecee3c6bf348b77b8785bcd8e35362a3507fb': Cleanup x86 flags and memset versions
| * \ \ \ \ \ \ \ \ \ \ \ am 9492b6e7: am 2de8102d: Merge "Fix bug in abort message processing."Christopher Ferris2013-10-091-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9492b6e72cef71422ba624e3cd11f07156cfb34a': Fix bug in abort message processing.
| * \ \ \ \ \ \ \ \ \ \ \ \ am 1c39fdcd: merge in KQS81MEd Heyl2013-10-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1c39fdcd9eb628338d7f273e43723585ca35721a': Only check caller when deriving permissions. Fix recursive locking bug.
| | * | | | | | | | | | | | merge in KQS81MEd Heyl2013-10-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-170-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-170-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-170-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / | | | | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-160-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-120-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-110-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-100-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-030-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | | | | | | | | | | Only check caller when deriving permissions.Jeff Sharkey2013-08-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10547597 Change-Id: Ied909f9047c2567e93dde0f4658d6e4b9ff161ab
| | | | | | | | | | * | | | | | | | | | | | Fix recursive locking bug.Jeff Sharkey2013-08-301-21/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handle_rename() would end up acquiring the lock twice. Change to always derive has_rw inside earlier locks (instead of acquiring a second time), and pass the value into check_caller_access_to_name(). Bug: 10547597 Change-Id: If5744d6d226a4785676c19d0f7fdf1c05060ed76
| * | | | | | | | | | | | | | | | | | | | | am e93a0517: Set GID required to write, media_rw mount point.Jeff Sharkey2013-10-082-13/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e93a0517f4c88310066ac39c6b268ebfcceef44e': Set GID required to write, media_rw mount point.
| | * | | | | | | | | | | | | | | | | | | | Set GID required to write, media_rw mount point.Jeff Sharkey2013-10-082-13/+17
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sdcard FUSE daemon flag to specify the GID required for a package to have write access. Normally sdcard_rw, but it will be media_rw for secondary external storage devices, so DefaultContainerService can still clean up package directories after uninstall. Create /mnt/media_rw which is where vold will mount raw secondary external storage devices before wrapping them in a FUSE instance. Bug: 10330128, 10330229 Change-Id: I4385c36fd9035cdf56892aaf7b36ef4b81f4418a
| * | | | | | | | | | | | | | | | | | | | am fa135f5c: am 7dbe9660: Merge "Update debuggerd to use libbacktrace."Christopher Ferris2013-10-048-204/+172
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fa135f5ce95a8eff2ff51c03ad2e9d9b2a8b2274': Update debuggerd to use libbacktrace.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 410f8c30: am 79b277ab: Merge "Set security context of /adb_keys and ↵Colin Cross2013-10-031-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /data/misc/adb/adb_keys." * commit '410f8c305b416484f17f068c37b785605a2f69eb': Set security context of /adb_keys and /data/misc/adb/adb_keys.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b1dd1765: am b42fc74f: Merge "Expose /dev/hw_random to group "system"."Alex Klyubin2013-10-031-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b1dd176520896efacbabd1df65d8bb56e1bfeb71': Expose /dev/hw_random to group "system".
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 81890fd8: am 5daba1e0: Merge "Only build host library on linux-x86."Christopher Ferris2013-10-021-32/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '81890fd80ffda1cbb259912b0e5ee29a5fa8c617': Only build host library on linux-x86.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b024bbf6: am 6da66ef4: Merge "Handle screendumps for all framebuffer sizes"Colin Cross2013-10-021-7/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b024bbf6a1daf752a8d756bfda472fe6fb48dd9e': Handle screendumps for all framebuffer sizes
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0e9abad8: am f3217de3: Merge "Fix problems in libbacktrace."Christopher Ferris2013-10-013-6/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e9abad8d22868bc2039380df2f4b29edd248402': Fix problems in libbacktrace.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 230252d5: am 61afb07b: Merge "Trigger a policy reload from post-fs-data."Colin Cross2013-10-011-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '230252d5cd70f5be4c24046c7a409e9498ac97f5': Trigger a policy reload from post-fs-data.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e3e22062: Merge "Add new cert_pin_failure tag that can be used in ↵William Luh2013-10-011-5/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user-consent filtering." into klp-dev * commit 'e3e22062f0a00bc23dade9c6f06d41e76dd7b351': Add new cert_pin_failure tag that can be used in user-consent filtering.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add new cert_pin_failure tag that can be used in user-consent ↵William Luh2013-09-301-5/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filtering." into klp-dev
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Add new cert_pin_failure tag that can be used in user-consent filtering.William Luh2013-09-251-5/+1
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10912373 Change-Id: If8a2f9829b3aac4abc33a4623c5f5b4966fd6870
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 3f0a5e9c: am 71a8aa34: Merge "Update comment from review."Christopher Ferris2013-09-301-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f0a5e9c9f279546fc5c89c61053554ef6eb43d3': Update comment from review.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7f21826c: am f41cf208: Merge "Create a single backtrace library."Christopher Ferris2013-09-3015-0/+1470
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7f21826c478088b4717cc6c7d1ff6ef3d7da464a': Create a single backtrace library.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1690a5a6: am aa62be65: Merge "Use SSE2 enhanced memset for capable x86 ↵Ying Wang2013-09-261-11/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | processors" * commit '1690a5a6943d4e4b65d5e4dcd077702c2c8f40a0': Use SSE2 enhanced memset for capable x86 processors
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bbe4c49b: Merge "Moves libmemtrack header to standard location" into klp-devAdam Lesinski2013-09-264-4/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bbe4c49b4eb664ca018ff670a4dcbf5b9de9a810': Moves libmemtrack header to standard location
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Moves libmemtrack header to standard location" into klp-devAdam Lesinski2013-09-264-4/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Moves libmemtrack header to standard locationAdam Lesinski2013-09-234-4/+12
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If8c80003bc2f042c67ffdf38469407de3c2fda2c
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 08170103: am 91962669: Merge "cutils: list: add list_for_each_safe"jp abgrall2013-09-251-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0817010366feecb53fc70719b3784dd7c6d66b55': cutils: list: add list_for_each_safe
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6d06b01c: am e245b8fb: Merge changes I9f858204,Ib35643b3Kenny Root2013-09-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d06b01cf4237bd43b6e13f1683fcfc4dae83e78': mincrypt: merge the two RSA verifiers mincrypt: support SHA-256 hash algorithm
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0b7d588d: am f2c4c4ad: Merge "init: Fix queue_all_property_triggers with ↵Benoit Goby2013-09-241-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nonexistent properties" * commit '0b7d588d531691904530ba57d772b31fb24ed343': init: Fix queue_all_property_triggers with nonexistent properties
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d38cc182: Merge "Disable timestamp logging." into klp-devBen Cheng2013-09-241-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd38cc182dbfce4a1d7e8e9c16bff10b71128cc01': Disable timestamp logging.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Disable timestamp logging." into klp-devBen Cheng2013-09-241-0/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \