OSDN Git Service

am b5cd1976: am c79f3d69: Merge "cherrypick from klp-modular-dev docs: Fix issue...
authorRicardo Cervera <rcervera@google.com>
Wed, 16 Jul 2014 13:29:00 +0000 (13:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Jul 2014 13:29:00 +0000 (13:29 +0000)
commit9e4db5b76ad11dd468d65e5030044d530872908f
treefa1b9c2b3d205fce8798e51e568d9e7cd3b9e171
parent4460bff8b39907bc8e39e60a27b078f20c35cc62
parentb5cd197646a18239e976649ffa99d39c6f568d2b
am b5cd1976: am c79f3d69: Merge "cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee" into klp-modular-docs

* commit 'b5cd197646a18239e976649ffa99d39c6f568d2b':
  cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee