tree 82cbecfdb529adc96717e967fc737cd063b55429
parent 6574a42d581efbab8e0607128b7effc1daa99b5f
parent 361aa65081842c1c04b6d6bbb471e256c5f17091
author David Pursehouse <david.pursehouse@sonymobile.com> 1448001391 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1448001398 +0900

Merge branch 'stable-2.11'

* stable-2.11:
  Adapt to upstream changes
  Bump gitiles-servlet to 0.1-6

Change-Id: I27a4ce7419ac5312f125b2ff8ceec54b472b2d79