tree e278ddb4d7ae20a621a21376b3f8a12eb78cb44a
parent 4b81e89d9b7a2cf3ed5aacd9c647aed47f4c4675
parent fa72a9eaae6170e65d9ba72720ee7b0d752f8847
author Jeff Brown <jeffbrown@google.com> 1397681544 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397681544 +0000

am fa72a9ea: Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev

* commit 'fa72a9eaae6170e65d9ba72720ee7b0d752f8847':
  Declare VersionCodes.KITKAT_WATCH.