tree eb81e274f11b6224322071864b419219fec3561b
parent cd6f6631bdfdceea842bbfcd58a512950fa9c2d2
parent ad96539afe082a566efcde8b161aa9e19a2970a8
author Lingfeng Yang <lfy@google.com> 1477009519 +0000
committer android-build-merger <android-build-merger@google.com> 1477009519 +0000

Merge "DO NOT MERGE ANYWHERE Upgrade 3.10 ranchu kernels to 1936fdf" into nyc-mr1-dev
am: ad96539afe  -s ours

Change-Id: I6380c20865ee1a813cad5f2416aac828ca20367f