ref: 65cfb808d06fc8646bc298aa7439efe3ff206bf5
parent: ad19724f1a77dd9a449f316507ce4dc73de8e27a
parent: e68c8dcfd2ae9bed6adb486974c6c3410e3bc7da
author: Paul Wilkins <paulwilkins@google.com>
date: Wed Dec 10 05:44:27 EST 2014
Merge "Substantial restructuring of AQ mode 2."