OSDN Git Service

am a772e67d: am 649eea00: am 791c827c: Merge "Zen: Return of the alarm warning."...
authorJohn Spurlock <jspurlock@google.com>
Thu, 17 Jul 2014 18:28:54 +0000 (18:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Jul 2014 18:28:54 +0000 (18:28 +0000)
commit0f0aed56d4168bffe98c1d0998f5087a22b3e8c2
tree56d7a1958ea12893c0298323085141f0e07928ae
parentffeaa8b3409c24d5bbd89438a3d7a2fcf870ed4e
parent96fbfc4f570e868269b1606f10df7d44730add6d
am a772e67d: am 649eea00: am 791c827c: Merge "Zen: Return of the alarm warning." into lmp-dev

* commit 'a772e67dd075b1c8e1b18ba81901a3b559bba5d4':