Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release

Change-Id: I96a28218361adfe4730e7c161cd5bd861976fbc6