OSDN Git Service

Merge branch 'master' of https://googleplex-android.googlesource.com/a/platform/frame...
authorChad Jones <chadj@google.com>
Thu, 29 Nov 2012 22:51:39 +0000 (14:51 -0800)
committerChad Jones <chadj@google.com>
Thu, 29 Nov 2012 22:51:39 +0000 (14:51 -0800)
commit6ce1093b8e9953b3c63deae0fd200942c524ae25
tree87a736fc424c8fa2929d3c254c6eb3ce37ffdb60
parent9a57c5c69b273f444543e78e06ec0bf0b8afda56
parent797105b9b51ed2188092c956db8ab734b8f7a7ad
Merge branch 'master' of https://googleplex-android.googlesource.com/a/platform/frameworks/native