DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
119 Commits 22 Branches 122 Tags
Commit Graph

119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Banes
f0806600d1 am cb0c34a1: am 8b85eb65: am 5cb08b09: am 6fff1f92: Merge "Fix TabLayout when used in a HorizontalScrollView" into lmp-mr1-ub-dev 
* commit 'cb0c34a19b62e9ea71ce02e36a69903f700fd510':
  Fix TabLayout when used in a HorizontalScrollView

GitOrigin-RevId=292f0c7594a6ac1fc906dc0ccbf3e2bda30b00a8

PiperOrigin-RevId: 140549050
 2016-12-09 18:20:59 -08:00
Yuichi Araki
c21e7adaf9 am da8a025a: am 4c319ebc: am 591e7ae3: am f9492b54: Remove unnecessary ripple 
* commit 'da8a025a9f008de831e4dd42edbd79f325f53848':
  Remove unnecessary ripple

GitOrigin-RevId=c36f4e50c1cd41340511eb2eb86e80d9baf7d111

PiperOrigin-RevId: 140549038
 2016-12-09 18:20:54 -08:00
Chris Banes
0f51a3c2de am 193f33fa: am 40fbb22c: am 2521e5cf: am 0b004890: Fix FAB not returning after Snackbar dismissal 
* commit '193f33fa9423e8b3b20751203ba27ebbf93e7fdd':
  Fix FAB not returning after Snackbar dismissal

GitOrigin-RevId=186bde69c35c241489f9d4daf0b5074565067948

PiperOrigin-RevId: 140549033
 2016-12-09 18:20:48 -08:00
Chris Banes
3936e95728 am 5fedbcde: am b0f7acd9: am bd917cf8: am 180b89d1: Merge "Move the Tab Indicator higher up the draw call stack" into lmp-mr1-ub-dev 
* commit '5fedbcde280d17655c7a18752b68c8e2a6036094':
  Move the Tab Indicator higher up the draw call stack

GitOrigin-RevId=5b6447c22ea6d958a3aa9fbf68d829eeb75f17bf

PiperOrigin-RevId: 140549028
 2016-12-09 18:20:43 -08:00
Chris Banes
954ad57807 am 543aff96: am 42e87040: am 01a40236: am 7a13691b: Ensure that SwipeDismissBehavior only swipes it\'s own View 
* commit '543aff966dcc1284c6f10237b443e97a1dda4a98':
  Ensure that SwipeDismissBehavior only swipes it's own View

GitOrigin-RevId=47c2186fbd7152bc336af74b9f5b3c32a26114d4

PiperOrigin-RevId: 140549022
 2016-12-09 18:20:37 -08:00
Yuichi Araki
8619ad1d0f am e616cf16: am a422b2ea: am 7366ff52: am d77d45c3: Merge "Fix issues with Drawable states in NavigationView" into lmp-mr1-ub-dev 
* commit 'e616cf162271f21cd847c7a713b88d493a31b005':
  Fix issues with Drawable states in NavigationView

GitOrigin-RevId=11375ef7310db46ad47e0cc1d3fa9eb620433d50

PiperOrigin-RevId: 140549016
 2016-12-09 18:20:31 -08:00
Chris Banes
a01fa27e3b am 9c3f8ce8: am c91e361a: am 4bcf2733: am fa591aab: Merge "Add APIs to TabLayout to get selected tab position" into lmp-mr1-ub-dev 
* commit '9c3f8ce88b19621542d59e0466d5c9c0a7b40924':
  Add APIs to TabLayout to get selected tab position

GitOrigin-RevId=e93e9d796f5da03d5b612942651946a18fc1a807

PiperOrigin-RevId: 140549005
 2016-12-09 18:20:26 -08:00
Chris Banes
61b62a9096 am 1694014e: am 5209f2f6: am 38fbaa58: am d6771842: Merge "Add LENGTH_INDEFINITE to Snackbar" into lmp-mr1-ub-dev 
* commit '1694014e76d05e68fbbff4f673e48cc6e6422543':
  Add LENGTH_INDEFINITE to Snackbar

GitOrigin-RevId=bbfc78d01630b6182923012f2a9a36fd7601d6f5

PiperOrigin-RevId: 140548996
 2016-12-09 18:20:21 -08:00
Jens Ole Lauridsen
740f51ef66 am 2a109f5a: am ab399fe4: am 6df24a0e: am e3b728db: Merge "DesignTime: Do not use animation in design time." into lmp-mr1-ub-dev 
* commit '2a109f5ac4d23b772837d02e7d8b4752a35723bf':
  DesignTime: Do not use animation in design time.

GitOrigin-RevId=26452251c32daccc9e44102322ea1a0b91318e07

PiperOrigin-RevId: 140548979
 2016-12-09 18:20:15 -08:00
Chris Banes
87f4c8ca53 am c12dbbba: am 5c0f9a9e: am 19603542: am fe2bbcd8: Merge "Simplify tab min/max width measure code" into lmp-mr1-ub-dev 
* commit 'c12dbbba49eeb05229e4dc97cfbcb3c686049d87':
  Simplify tab min/max width measure code

GitOrigin-RevId=e25caf67ef5b6743788f31a889e27ed45dd4ce1f

PiperOrigin-RevId: 140548968
 2016-12-09 18:20:10 -08:00
Chris Banes
da424be914 am b71d35cd: am 5baf672a: am 1f9bc6c1: am ca21b5bb: Merge "Drag in the EditText\'s hint colors in TextInputLayout" into lmp-mr1-ub-dev 
* commit 'b71d35cd7ae512b5d218babb5c3599cb24b069ca':
  Drag in the EditText's hint colors in TextInputLayout

GitOrigin-RevId=a30ec1e2eb23acbdb3ca3691eb6287aa0427334c

PiperOrigin-RevId: 140548957
 2016-12-09 18:20:03 -08:00
Chris Banes
9a7554b334 am e161ad5f: am 627b95b7: am 29b4c372: am 344bc9b6: Merge "Fix Tab click not updating the visible selected Tab" into lmp-mr1-ub-dev 
* commit 'e161ad5f76360b39349974498af51842b508f2f5':
  Fix Tab click not updating the visible selected Tab

GitOrigin-RevId=cd8236ec187d4ecb331ab2a0324ca86cd95b3f57

PiperOrigin-RevId: 140548949
 2016-12-09 18:19:58 -08:00
Chris Banes
de3caac841 am a2c48e53: am 1793071e: am ded3a5d5: Merge "API council review feedback for ActionMenuView - support edition" into mnc-dev 
* commit 'a2c48e533c8b7907529d17aa826d183fc7bac4e3':
  API council review feedback for ActionMenuView - support edition

GitOrigin-RevId=52bdf216d40c70c8e96e140818eebadf5813dcb7

PiperOrigin-RevId: 140548932
 2016-12-09 18:19:52 -08:00
Chris Banes
fd85cc27a5 am c2063e18: am 39e15503: am cdc03eb4: Merge "DesignTime: Compute the size of the collapsed text correctly from start." into mnc-dev 
* commit 'c2063e188ad779fc8672e1cd10281a8b66cda988':
  DesignTime: Compute the size of the collapsed text correctly from start.

GitOrigin-RevId=d93aa96d14039ef51474dfc980b8ca5379686e02

PiperOrigin-RevId: 140548925
 2016-12-09 18:19:47 -08:00
Chris Banes
7f9d8779a7 am 660bffe7: am 9dc0278c: am 6f96f0e9: am ea61bdd2: Merge "Fix Snackbar sw600dp gravity" into lmp-mr1-ub-dev 
* commit '660bffe70407ba022449a855cb7c711b104db44e':
  Fix Snackbar sw600dp gravity

GitOrigin-RevId=6cfae581f04218dca47aa0732e8613d64620b73e

PiperOrigin-RevId: 140548921
 2016-12-09 18:19:42 -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
a4fe57a79c am e5bbf858: am f79ce487: am bc44b866: am 6ca28414: Merge "Make TabLayout more customizable" into lmp-mr1-ub-dev 
* commit 'e5bbf858ddc56dd5ce4637bb63db64590358db02':
  Make TabLayout more customizable

GitOrigin-RevId=df738a15738226f28bd8407c71a17fb6e222d6d4

PiperOrigin-RevId: 140548895
 2016-12-09 18:19:31 -08:00
Yuichi Araki
5872f58c8f am 2d0bc6c8: am 86745db1: am ee460c94: am 024b3639: Fix NPE on orientation change 
* commit '2d0bc6c8d611f00570b4794168ba235568171df2':
  Fix NPE on orientation change

GitOrigin-RevId=2c07630da76833f8b62b8a4307b60004349845a1

PiperOrigin-RevId: 140548884
 2016-12-09 18:19:25 -08:00
Chris Banes
f9009de091 am 8e0b8093: am 551a28ad: am 39cfe79f: am a0e42834: Merge "Allow AppBarLayout to handle size changes" into lmp-mr1-ub-dev 
* commit '8e0b80934b91b5398cd0a652fcd6316a7b98b472':
  Allow AppBarLayout to handle size changes

GitOrigin-RevId=d8bf9fa65716dd427e0ee2366802385185f23c4e

PiperOrigin-RevId: 140548869
 2016-12-09 18:19:20 -08:00
Chris Banes
c3c5e74e7a am 9a574b71: am 6dfb913f: am 55e77e6a: am 153fa9a0: Add method to change NavigationView text appearance 
* commit '9a574b71a77818195b2ff808135002c7de867400':
  Add method to change NavigationView text appearance

GitOrigin-RevId=9d9ef01ea4c6511396b26f6f4d14cf42b62732df

PiperOrigin-RevId: 140548868
 2016-12-09 18:19:14 -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
db024f09c5 am 54933dc7: am 871f7ae0: am 5a27940c: am 1cb0698d: Merge "Improvements to TextInputLayout" into lmp-mr1-ub-dev 
* commit '54933dc742b11f6c2623ea12369719195e6c1bdb':
  Improvements to TextInputLayout

GitOrigin-RevId=2b5f7a8388a2c2de80b33fefd67fae98457efb64

PiperOrigin-RevId: 140548846
 2016-12-09 18:19:03 -08:00
Yuichi Araki
dd5bf43dc6 am 9fe27e97: am e6df0157: am ac09900d: am 9b6192b8: Merge "NavigationView handles checked status" into lmp-mr1-ub-dev 
* commit '9fe27e97b81b99be510acdb644f23d56c8c7d429':
  NavigationView handles checked status

GitOrigin-RevId=36728a2ee9e2a1e6aabb0ae61a3b74a07ceac039

PiperOrigin-RevId: 140548834
 2016-12-09 18:18:57 -08:00
Chris Banes
6b4a20fe30 am b6684d70: am 805fe036: am d2212bf0: am d9d3addb: Fix CollapsingToolbarLayout not invalidating text 
* commit 'b6684d7060ac2d6223eca10ad382f9cedc6483aa':
  Fix CollapsingToolbarLayout not invalidating text

GitOrigin-RevId=b1095e9d682c31262a5be659a14c7af0ad6455ec

PiperOrigin-RevId: 140548827
 2016-12-09 18:18:51 -08:00
Chris Banes
3143786830 am b3a2664f: am ba02c9da: am 57a0f459: am 88cccf6c: Fix NoSuchMethodError in CoL on Eclair 2.1 
* commit 'b3a2664ff3b40fa44a3f8fe5d1d91dfdfa8b765e':
  Fix NoSuchMethodError in CoL on Eclair 2.1

GitOrigin-RevId=99e551c073e9573c49e611e7a943ffd4003ea015

PiperOrigin-RevId: 140548820
 2016-12-09 18:18:46 -08:00
Yuichi Araki
694c7b4f04 am 4035000d: am fd3dcc06: am 6817ed03: am 9c1547f8: Merge "Fix NPE in NavigationView" into lmp-mr1-ub-dev 
* commit '4035000dbefd9670aed1ded4d14cbd9e524b82d8':
  Fix NPE in NavigationView

GitOrigin-RevId=e17d71ad94089ae4ad4bf914c5262ed3adb5a9fb

PiperOrigin-RevId: 140548809
 2016-12-09 18:18:40 -08:00
Yuichi Araki
974bff077b am 5d774a17: am 1243f6f3: am 762955b3: am af016cf1: Merge "Fix for menu XML ending with a sub menu" into lmp-mr1-ub-dev 
* commit '5d774a17320f94d75b360f572a562d00c78e5911':
  Fix for menu XML ending with a sub menu

GitOrigin-RevId=245d1e14c05a695e45c7f887a1ac1d03cfae2d7a

PiperOrigin-RevId: 140548800
 2016-12-09 18:18:35 -08:00
Chris Banes
f238714b0d am de947589: am f6e9a17c: am 7afe341e: am 6a93c2eb: Merge "Add typeface support to TextInputLayout" into lmp-mr1-ub-dev 
* commit 'de9475899e1bfe096a3584d6d9055216f6a3cab9':
  Add typeface support to TextInputLayout

GitOrigin-RevId=930a864f3993a1d69c9156e529950aca626c768e

PiperOrigin-RevId: 140548790
 2016-12-09 18:18:29 -08:00
Chris Banes
b78787570f am 8fe81474: am d2fd17b1: am f42357c2: am 26389612: Merge "Ensure TabLayout + ViewPager selected item are in sync" into lmp-mr1-ub-dev 
* commit '8fe81474719a79a4a1805783185a5cffca81c774':
  Ensure TabLayout + ViewPager selected item are in sync

GitOrigin-RevId=bd25a300b161fa959e09a2cdf4268cc88b7a34aa

PiperOrigin-RevId: 140548779
 2016-12-09 18:18:24 -08:00
Chris Banes
85317eb49d am b7611f33: am 4deeeddf: am 523bcc06: am 380851fd: Merge "Fix setRippleColor on FloatingActionButton" into lmp-mr1-ub-dev 
* commit 'b7611f337c4f364aa7cd5b51ecbc36e4defce36f':
  Fix setRippleColor on FloatingActionButton

GitOrigin-RevId=93fc3bdc774bf3ed82f35db19203369f2889b73a

PiperOrigin-RevId: 140548762
 2016-12-09 18:18:18 -08:00
Chris Banes
72e2a17f23 am 1eb7338d: am 3614493a: am 8eb27627: am 5a86f7c8: Merge "Make the FAB appear visually correct pre-L" into lmp-mr1-ub-dev 
* commit '1eb7338d5214ee0028dae53de08605d4afafe535':
  Make the FAB appear visually correct pre-L

GitOrigin-RevId=80c9ff16bde4556fd9ce0a4988747ffa9e00da69

PiperOrigin-RevId: 140548756
 2016-12-09 18:18:13 -08:00
Chris Banes
770cf1a6ac am 77eac344: am edad3de0: am c179c5f7: am 613dfb42: Merge "Allow setting the Tab Indicator at runtime" into lmp-mr1-ub-dev 
* commit '77eac344dced786faba1b19aabfafca9ea9db9e6':
  Allow setting the Tab Indicator at runtime

GitOrigin-RevId=bc34aa60b5ae4782f40012c1c94b7fad826afb68

PiperOrigin-RevId: 140548740
 2016-12-09 18:18:07 -08:00
Yuichi Araki
ac22c60804 am 0a5f0cec: am e8a4de1f: am 25bfc2ea: am b2f46f83: Merge "Keep the selected state of items in NavigationView" into lmp-mr1-ub-dev 
* commit '0a5f0ceceff583b5b36ce3fd7b873f10615cce6e':
  Keep the selected state of items in NavigationView

GitOrigin-RevId=b97a06c9da173b4494b68348053539249776a05f

PiperOrigin-RevId: 140548728
 2016-12-09 18:18:01 -08:00
Chris Banes
fe0feddf23 am 494333e7: am 2b7796be: am f833f728: am c0b8bcbb: Merge "Add a Callback to Snackbar" into lmp-mr1-ub-dev 
* commit '494333e7fd20ed4400fcb716399fe58316c8f0f9':
  Add a Callback to Snackbar

GitOrigin-RevId=6aa1fe9076fcbcb1ef909f6b89439094c1917dd9

PiperOrigin-RevId: 140548725
 2016-12-09 18:17:55 -08:00
Chris Banes
868ae2938c am 2f50db18: am 5522362d: am 88099e98: am 252b1765: Merge "Fix TextInputLayout laying out RTL text as LTR" into lmp-mr1-ub-dev 
* commit '2f50db1865e1182e7574222c707003a1168298ee':
  Fix TextInputLayout laying out RTL text as LTR

GitOrigin-RevId=e1300952cb43e49cebb185b826278f43c042d76a

PiperOrigin-RevId: 140548720
 2016-12-09 18:17:50 -08:00
Chris Banes
2b80392e4e am ae900280: am 32985d46: am 5e25a58f: am a611711d: Take compound drawables into account for TextInputLayout 
* commit 'ae9002803ac35c40697efb79d8ef1c5c4015ae2f':
  Take compound drawables into account for TextInputLayout

GitOrigin-RevId=bf57401b0f8551d4a4d4df6c05d82c35a88c1a30

PiperOrigin-RevId: 140548713
 2016-12-09 18:17:44 -08:00
Chris Banes
2d2a80e2f4 am 7d2630c4: am 385b037d: am 86385d7b: am b08e15be: Merge "Fix custom Snackbar durations not working" into lmp-mr1-ub-dev 
* commit '7d2630c4db174a787cf939e63f8f828f965e8317':
  Fix custom Snackbar durations not working

GitOrigin-RevId=7ed439d59a37ce40c420a393df42b1ea78c2c6e5

PiperOrigin-RevId: 140548709
 2016-12-09 18:17:38 -08:00
Chris Banes
8f02c50f98 am ca92a70a: am 6ccc92a3: am c13c14c1: am 39dcb8e6: Merge "Fix NavigationView\'s text appearance" into lmp-mr1-ub-dev 
* commit 'ca92a70a1e01c4a856c957e0202785fcf60aac14':
  Fix NavigationView's text appearance

GitOrigin-RevId=21852106da03ab48e9694eb848968b720fd7d7c4

PiperOrigin-RevId: 140548704
 2016-12-09 18:17:33 -08:00
Chris Banes
2dddab3605 am 11b652b9: am 973ef1dc: am 58df9e66: am 47f4c78d: Merge "Make sure we always use the provide Tab text colors" into lmp-mr1-ub-dev 
* commit '11b652b978d834a4c3c263f3eb0c592f4cdc29ec':
  Make sure we always use the provide Tab text colors

GitOrigin-RevId=2f7caff3604c52af0fbea6db18d3c63905ab2305

PiperOrigin-RevId: 140548697
 2016-12-09 18:17:28 -08:00
Chris Banes
5121b1b672 am bdbc31e3: am 8ce4632e: am 65f10b7f: am 2c638f15: Disable the FAB\'s border for now 
* commit 'bdbc31e3bcd6dc4c20e7093724f42b89c732d6ec':
  Disable the FAB's border for now

GitOrigin-RevId=0cc5d6621e79c9673ef0a785593b835a3a7fc1be

PiperOrigin-RevId: 140548692
 2016-12-09 18:17:22 -08:00
Chris Banes
de9c33f84a am 5506d33b: am 028202cf: am 5b5ca2a4: am a59da11d: Improve the offsetTopAndBottom workaround 
* commit '5506d33bc32b8b4702ead821267157b88ff139f2':
  Improve the offsetTopAndBottom workaround

GitOrigin-RevId=404ed7efdf62b9247f5d86bf3bcc3cc0364c5bcc

PiperOrigin-RevId: 140548684
 2016-12-09 18:17:17 -08:00
Chris Banes
0a62378d9a am 9cfb0748: am 2967aa90: am f1dfc73b: am 9e810f95: CollapingToolbarLayout styling tweaks 
* commit '9cfb0748f588cfaa13e8377668549dd0405458f6':
  CollapingToolbarLayout styling tweaks

GitOrigin-RevId=aa19bd32ea69c5d32825edec8619569eb6ec6d21

PiperOrigin-RevId: 140548678
 2016-12-09 18:17:11 -08:00
Chris Banes
db48fec0ac am f586156e: am aa1beef7: am ed048c6c: am 790288a0: Merge "Only start nested scrolling if the view is large enough" into lmp-mr1-ub-dev 
* commit 'f586156eeb13eb210bb0297aa25e9b9b120f5bc9':
  Only start nested scrolling if the view is large enough

GitOrigin-RevId=d7469f6087c6f180641a3f38d11e521ed9a51b05

PiperOrigin-RevId: 140548673
 2016-12-09 18:17:06 -08:00
Chris Banes
7d75b44129 am 8a9a0b8f: am 6fee9288: am 5df6c6fe: am ecd4b988: Fix AppBarLayout not scrolling fully 
* commit '8a9a0b8f8bebb57b24ced907813fbc9f91ec8e6d':
  Fix AppBarLayout not scrolling fully

GitOrigin-RevId=f61c1e4c51b2a45471adc4cc80338ca79716c828

PiperOrigin-RevId: 140548665
 2016-12-09 18:17:00 -08:00
Chris Banes
ba415acdc2 am 48c51e59: am 7ae9fe16: am 624e90dc: am b1a51676: Fix offset calculation math 
* commit '48c51e594853c0f5a840dc6b75690b2af9d48dec':
  Fix offset calculation math

GitOrigin-RevId=ba8b85a4ef455d64bb2cf640c47bc47eac657347

PiperOrigin-RevId: 140548657
 2016-12-09 18:16:54 -08:00
Chris Banes
e3ab398a87 am bac4ae27: am 631fdcf6: am 80eeb54e: am 3fbc0c0f: Merge "More TabLayout fixes" into lmp-mr1-ub-dev 
* commit 'bac4ae27bdd61a87c9717a7b3d8395bd142c9b9f':
  More TabLayout fixes

GitOrigin-RevId=f7fa7c60c8b120017023f763d6465b494ec0c59d

PiperOrigin-RevId: 140548652
 2016-12-09 18:16:49 -08:00
Chris Banes
bc1e2d1182 am 7ad50064: am bb04ebab: am 38895324: am 0fa9761d: Merge "Fix FAB shadow on L" into lmp-mr1-ub-dev 
* commit '7ad50064d9b84c158c962437a0e3ac98a95d887d':
  Fix FAB shadow on L

GitOrigin-RevId=c24bd80edc3d83da1cc5e149efd616ddf9050d87

PiperOrigin-RevId: 140548648
 2016-12-09 18:16:43 -08:00
Chris Banes
807102e398 am 4c873126: am 542391c0: am be84b3b7: am c1ce4f6c: Fix non-enterAlways scrolling 
* commit '4c873126bb464620fd3fdecbb3b6908d3343aff1':
  Fix non-enterAlways scrolling

GitOrigin-RevId=b05aecabaa7e43d6b0f0af9397d71e1d373187dd

PiperOrigin-RevId: 140548642
 2016-12-09 18:16:38 -08:00
Chris Banes
447a76ba94 am 734e73ae: am 5640743f: am e3fd421e: am 902c8ca6: Merge "Fix flickering with TabLayout + ViewPager" into lmp-mr1-ub-dev 
* commit '734e73ae0e1d2f493ce26405ed376e66f2416c78':
  Fix flickering with TabLayout + ViewPager

GitOrigin-RevId=d43fde9ac7c7279a79c3ce47c35c090d3ac0f7ca

PiperOrigin-RevId: 140548637
 2016-12-09 18:16:32 -08:00
Adam Powell
ac585f0241 am 0c05c9fd: am 68c1d88f: am d09e24f8: Fix CoordinatorLayout anchor gravity handling 
* commit '0c05c9fd428f0dfd1035370d17bc49de97def849':
  Fix CoordinatorLayout anchor gravity handling

GitOrigin-RevId=dde33490d4f640f48d5e0f68665613aed50c316a

PiperOrigin-RevId: 140548622
 2016-12-09 18:16:27 -08:00