6 Commits

Author SHA1 Message Date
Chris Banes
b899270b48 am 1fddbd99: am fe71b8ba: am 025760e0: am 28193403: Merge "Prefix design lib resources to try and avoid conflicts" into lmp-mr1-ub-dev
* commit '1fddbd999c421df6b31108b8094f46b8008feb5b':
  Prefix design lib resources to try and avoid conflicts

GitOrigin-RevId=ee2beb07a131386685ed7dcbb006fd384bac5386

PiperOrigin-RevId: 140549114
2016-12-09 18:21:16 -08:00
Chris Banes
3b775ef746 am abc5dba2: am 827a2c0b: am 2970824d: am b6eaf30a: Merge "Show/hide FloatingActionButton improvements" into lmp-mr1-ub-dev
* commit 'abc5dba21788b954c50a98f47c5464e294b44d19':
  Show/hide FloatingActionButton improvements

GitOrigin-RevId=6f01f83793fc28ed998713bedc1b02a92d1ff127

PiperOrigin-RevId: 140548916
2016-12-09 18:19:36 -08:00
Chris Banes
dded5c795d am 75962f62: am 40202264: am 3de57119: am cc102ca5: Merge "Re-enable border sheen (aka border)" into lmp-mr1-ub-dev
* commit '75962f6207ea6f1404d44d0f75c48f7aa9c13adb':
  Re-enable border sheen (aka border)

GitOrigin-RevId=58ca0d90dbcd10a254eb17bed3dd57ab4d111bd2

PiperOrigin-RevId: 140548857
2016-12-09 18:19:09 -08:00
Chris Banes
07e01a9c06 am 4ae83371: am cc29b5d7: am 302adaa3: Merge "Improve FloatingActionButton border implementation" into lmp-mr1-ub-dev
* commit '4ae83371c7e0c71a2d2c38999f43f6115b61f6cb':
  Improve FloatingActionButton border implementation

GitOrigin-RevId=02dd0be9fb45ba427988dea8d6d8d2b82e36387b

PiperOrigin-RevId: 140548583
2016-12-09 18:16:10 -08:00
Chris Banes
0b02fec15c am 1b5d11f9: am 10597477: Merge "FloatingActionButton border" into mnc-dev
* commit '1b5d11f9e55fa2e5930498d12593a129f6cb497d':
  FloatingActionButton border

GitOrigin-RevId=3154355964d210ce03756261e446bba5a739889c

PiperOrigin-RevId: 140548538
2016-12-09 18:15:53 -08:00
Chris Banes
e114b06a07 am 2ccb1350: am ec957eb4: Merge "Floating Action Button" into lmp-mr1-ub-dev
* commit '2ccb1350393621eaac6e179e7c6a8c92372f5eb9':
  Floating Action Button

GitOrigin-RevId=a3f7514a6dc54845de30cbee0253279e76fb72c4

PiperOrigin-RevId: 140544624
2016-12-09 17:56:20 -08:00