tree 565144844a4013269f52f97a98dc5171dbb445ae
parent b7f64979e1d52ec7e819a61b442aee648899c5c4
parent e8f410c748bb0497fde70807d726ab4b07aaa995
author Narayan Kamath <narayan@google.com> 1505407878 +0000
committer android-build-merger <android-build-merger@google.com> 1505407878 +0000

Merge "Revert "Revert "Upgrade to 2.1.8-stable (2017-01-22)." and "Probably Mac build fix?""" am: d78626f7ab am: b3dd969b85 am: 350c14802f
am: e8f410c748

Change-Id: Ibb9b6266df12729f192514b75a9b57bbf1a7f862