tree f6ca59dd1157a8654767b3e03b2dff011c4116f0
parent a15746bead08b7dfee3e513fb2585a0e8c41f95e
parent bb170d47f5db48d75172475637a5cc7b1e7c5192
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1361924209 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1361924209 -0800

Merge feature branch 'feature-auto-update'

Change-Id: I8949b3bb24d853e486b00a82b0e3a63d0d5cf1e2